mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-22 00:06:12 -05:00
MacOS CI (#35407)
[infrastructure] [macos] use QGIS-Mac-Packager dependencies to setup MacOS CI build with GitHub workflows. Use CMake's define QGIS_MAC_DEPS_DIR to define folder to dependencies
This commit is contained in:
parent
0fe2ec2f70
commit
62bcc92339
41
.github/workflows/macos-build.yml
vendored
Normal file
41
.github/workflows/macos-build.yml
vendored
Normal file
@ -0,0 +1,41 @@
|
||||
name: Mac OS build
|
||||
on: [push, pull_request]
|
||||
env:
|
||||
QT_VERSION: 5.14.1
|
||||
QGIS_DEPS_VERSION: 0.2.2
|
||||
|
||||
jobs:
|
||||
mac_os_build:
|
||||
if: github.repository == 'qgis/QGIS'
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: download qgis-deps
|
||||
run: |
|
||||
wget https://qgis.org/downloads/macos/deps/qt-${QT_VERSION}.tar.gz
|
||||
wget https://qgis.org/downloads/macos/deps/qgis-deps-${QGIS_DEPS_VERSION}.tar.gz
|
||||
wget https://qgis.org/downloads/macos/deps/install_qgis_deps-${QGIS_DEPS_VERSION}.bash
|
||||
|
||||
- name: install qgis-deps
|
||||
run: |
|
||||
chmod +x ./install_qgis_deps-${QGIS_DEPS_VERSION}.bash
|
||||
sudo ./install_qgis_deps-${QGIS_DEPS_VERSION}.bash
|
||||
|
||||
- name: create build system
|
||||
run: |
|
||||
QGIS_DIR=`pwd`
|
||||
mkdir -p ../build-QGIS
|
||||
cd ../build-QGIS
|
||||
|
||||
PATH=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage/bin:$PATH \
|
||||
cmake -DQGIS_MAC_DEPS_DIR=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage \
|
||||
-DCMAKE_PREFIX_PATH=/opt/Qt/${QT_VERSION}/clang_64 \
|
||||
-DWITH_BINDINGS=TRUE \
|
||||
-DWITH_3D=TRUE \
|
||||
$QGIS_DIR
|
||||
|
||||
- name: build QGIS
|
||||
run: |
|
||||
cd ../build-QGIS
|
||||
make -j $(sysctl -n hw.ncpu)
|
@ -31,6 +31,20 @@ ENDIF (APPLE)
|
||||
MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
|
||||
MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")
|
||||
|
||||
#############################################################
|
||||
IF (APPLE)
|
||||
# QGIS custom dependencies package from qgis/QGIS-Mac-Packager
|
||||
# they can be downloaded from https://qgis.org/downloads/macos/qgis-deps
|
||||
# and extracted to /opt/QGIS/qgis-deps-<deps-version>/stage
|
||||
SET (QGIS_MAC_DEPS_DIR "" CACHE PATH "Path to QGIS Mac custom dependencies directory")
|
||||
|
||||
# Setup LIB_DIR and CMAKE_PREFIX_PATH to help CMake's
|
||||
# find_packages to look for these libraries instead of system libraries
|
||||
IF ( QGIS_MAC_DEPS_DIR )
|
||||
SET(ENV{LIB_DIR} ${QGIS_MAC_DEPS_DIR})
|
||||
LIST(APPEND CMAKE_PREFIX_PATH ${QGIS_MAC_DEPS_DIR})
|
||||
ENDIF ( QGIS_MAC_DEPS_DIR )
|
||||
ENDIF (APPLE)
|
||||
|
||||
#############################################################
|
||||
# Configure OpenCL if available
|
||||
@ -683,8 +697,9 @@ IF (WITH_CORE)
|
||||
SET (QGIS_MACAPP_PREFIX ${CMAKE_INSTALL_PREFIX}/${QGIS_APP_NAME}.app/Contents)
|
||||
# common prefix for components, let cmake handle it
|
||||
SET (CMAKE_INSTALL_PREFIX ${QGIS_MACAPP_PREFIX}/MacOS)
|
||||
# 4 bundling levels, each includes previous
|
||||
# 0 nothing
|
||||
# 5 bundling levels, each includes previous
|
||||
# -1 nothing
|
||||
# 0 fixup the library paths for all QGIS libraries with @loader_path
|
||||
# 1 Qt frameworks
|
||||
# 2 non-system libraries, "standard"
|
||||
# 3 non-system frameworks, "standalone"
|
||||
@ -846,7 +861,7 @@ ENDIF (DISABLE_DEPRECATED)
|
||||
#############################################################
|
||||
# Python build dependency
|
||||
|
||||
FIND_PACKAGE(PythonInterp 3 REQUIRED)
|
||||
FIND_PACKAGE(PythonLibrary REQUIRED)
|
||||
|
||||
#############################################################
|
||||
# Python bindings
|
||||
|
@ -13,10 +13,13 @@ MACRO(FIND_BISON)
|
||||
FIND_PROGRAM(BISON_EXECUTABLE PATHS
|
||||
NAMES bison.exe
|
||||
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
|
||||
)
|
||||
)
|
||||
ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
|
||||
FIND_PROGRAM(BISON_EXECUTABLE bison PATHS $ENV{LIB_DIR}/bin NO_DEFAULT_PATH)
|
||||
ELSE (MSVC)
|
||||
FIND_PROGRAM(BISON_EXECUTABLE bison)
|
||||
ENDIF (MSVC)
|
||||
|
||||
IF (NOT BISON_EXECUTABLE)
|
||||
|
||||
MESSAGE(FATAL_ERROR "Bison not found - aborting")
|
||||
|
@ -9,8 +9,8 @@
|
||||
#
|
||||
|
||||
|
||||
FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exiv2.hpp /usr/local/include /usr/include)
|
||||
FIND_LIBRARY(EXIV2_LIBRARY NAMES exiv2 PATHS /usr/local/lib /usr/lib)
|
||||
FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exiv2.hpp $ENV{LIB_DIR}/include /usr/local/include /usr/include)
|
||||
FIND_LIBRARY(EXIV2_LIBRARY NAMES exiv2 PATHS $ENV{LIB_DIR}/lib /usr/local/lib /usr/lib)
|
||||
|
||||
IF (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARY)
|
||||
SET(EXIV2_FOUND TRUE)
|
||||
|
@ -32,9 +32,14 @@ IF(WIN32)
|
||||
CACHE STRING INTERNAL)
|
||||
ENDIF (GDAL_LIBRARY)
|
||||
ENDIF (MSVC)
|
||||
|
||||
|
||||
|
||||
ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
|
||||
|
||||
FIND_PATH(GDAL_INCLUDE_DIR gdal.h "$ENV{LIB_DIR}/include")
|
||||
FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS "$ENV{LIB_DIR}/lib")
|
||||
|
||||
ELSE(WIN32)
|
||||
|
||||
IF(UNIX)
|
||||
|
||||
# try to use framework on mac
|
||||
@ -81,6 +86,7 @@ ELSE(WIN32)
|
||||
FIND_PROGRAM(GDAL_CONFIG gdal-config
|
||||
${GDAL_CONFIG_PREFER_PATH}
|
||||
${GDAL_CONFIG_PREFER_FWTOOLS_PATH}
|
||||
$ENV{LIB_DIR}/bin
|
||||
/usr/local/bin/
|
||||
/usr/bin/
|
||||
)
|
||||
|
@ -18,8 +18,8 @@ INCLUDE (${CMAKE_SOURCE_DIR}/cmake/MacPlistMacros.cmake)
|
||||
IF(WIN32)
|
||||
|
||||
IF (MINGW)
|
||||
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h /usr/local/include /usr/include c:/msys/local/include)
|
||||
FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
|
||||
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" /usr/local/include /usr/include c:/msys/local/include)
|
||||
FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" /usr/local/lib /usr/lib c:/msys/local/lib)
|
||||
ENDIF (MINGW)
|
||||
|
||||
IF (MSVC)
|
||||
@ -30,6 +30,11 @@ IF(WIN32)
|
||||
)
|
||||
ENDIF (MSVC)
|
||||
|
||||
ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
|
||||
|
||||
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h "$ENV{LIB_DIR}/include" )
|
||||
FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS "$ENV{LIB_DIR}/lib" )
|
||||
|
||||
ELSE(WIN32)
|
||||
|
||||
IF(UNIX)
|
||||
@ -71,6 +76,7 @@ ELSE(WIN32)
|
||||
SET(GEOS_CONFIG_PREFER_PATH "$ENV{GEOS_HOME}/bin" CACHE STRING "preferred path to GEOS (geos-config)")
|
||||
FIND_PROGRAM(GEOS_CONFIG geos-config
|
||||
${GEOS_CONFIG_PREFER_PATH}
|
||||
$ENV{LIB_DIR}/bin
|
||||
/usr/local/bin/
|
||||
/usr/bin/
|
||||
)
|
||||
|
@ -174,15 +174,21 @@ IF (UNIX)
|
||||
ENDIF (UNIX)
|
||||
|
||||
IF (APPLE)
|
||||
IF (GRASS_FIND_VERSION EQUAL 7)
|
||||
LIST(APPEND GRASS_PATHS
|
||||
/Applications/GRASS-7.6.app/Contents/MacOS
|
||||
/Applications/GRASS-7.4.app/Contents/MacOS
|
||||
/Applications/GRASS-7.2.app/Contents/MacOS
|
||||
/Applications/GRASS-7.0.app/Contents/MacOS
|
||||
)
|
||||
ENDIF ()
|
||||
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)
|
||||
IF (QGIS_MAC_DEPS_DIR)
|
||||
FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0)
|
||||
LIST (APPEND GRASS_PATHS $ENV{LIB_DIR}/grass${GRASS_FIND_VERSION}${VERSION_MINOR})
|
||||
ENDFOREACH(VERSION_MINOR)
|
||||
ELSE (QGIS_MAC_DEPS_DIR)
|
||||
IF (GRASS_FIND_VERSION EQUAL 7)
|
||||
LIST(APPEND GRASS_PATHS
|
||||
/Applications/GRASS-7.6.app/Contents/MacOS
|
||||
/Applications/GRASS-7.4.app/Contents/MacOS
|
||||
/Applications/GRASS-7.2.app/Contents/MacOS
|
||||
/Applications/GRASS-7.0.app/Contents/MacOS
|
||||
)
|
||||
ENDIF ()
|
||||
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)
|
||||
ENDIF (QGIS_MAC_DEPS_DIR)
|
||||
ENDIF (APPLE)
|
||||
|
||||
IF (WITH_GRASS${GRASS_CACHE_VERSION})
|
||||
|
@ -65,6 +65,7 @@ ELSE(WIN32)
|
||||
SET(GSL_CONFIG_PREFER_PATH "$ENV{GSL_HOME}/bin" CACHE STRING "preferred path to GSL (gsl-config)")
|
||||
FIND_PROGRAM(GSL_CONFIG gsl-config
|
||||
${GSL_CONFIG_PREFER_PATH}
|
||||
$ENV{LIB_DIR}/bin
|
||||
/usr/local/bin/
|
||||
/usr/bin/
|
||||
)
|
||||
|
@ -15,39 +15,32 @@
|
||||
|
||||
FIND_PATH(LIBZIP_INCLUDE_DIR
|
||||
zip.h
|
||||
PATHS
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
"$ENV{LIB_DIR}/include"
|
||||
"$ENV{INCLUDE}"
|
||||
)
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
)
|
||||
|
||||
FIND_PATH(LIBZIP_CONF_INCLUDE_DIR
|
||||
zipconf.h
|
||||
PATHS
|
||||
/usr/local/lib/libzip/include
|
||||
/usr/lib/libzip/include
|
||||
"$ENV{LIB_DIR}/include"
|
||||
"$ENV{LIB_DIR}/lib/libzip/include"
|
||||
"$ENV{LIB}/lib/libzip/include"
|
||||
/usr/local/lib/libzip/include
|
||||
/usr/lib/libzip/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
"$ENV{LIB_DIR}/include"
|
||||
"$ENV{INCLUDE}"
|
||||
)
|
||||
)
|
||||
|
||||
FIND_LIBRARY(LIBZIP_LIBRARY
|
||||
NAMES zip
|
||||
PATHS
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
"$ENV{LIB_DIR}/lib"
|
||||
"$ENV{LIB}"
|
||||
)
|
||||
FIND_LIBRARY(LIBZIP_LIBRARY NAMES zip PATHS "$ENV{LIB_DIR}/lib" "$ENV{LIB}" /usr/local/lib /usr/lib )
|
||||
|
||||
IF (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR AND LIBZIP_CONF_INCLUDE_DIR)
|
||||
SET(LIBZIP_FOUND TRUE)
|
||||
SET(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIR} ${LIBZIP_CONF_INCLUDE_DIR})
|
||||
ENDIF (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR AND LIBZIP_CONF_INCLUDE_DIR)
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG
|
||||
LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR LIBZIP_CONF_INCLUDE_DIR)
|
||||
|
||||
SET(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIR} ${LIBZIP_CONF_INCLUDE_DIR})
|
||||
MARK_AS_ADVANCED(LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR LIBZIP_CONF_INCLUDE_DIR LIBZIP_INCLUDE_DIRS)
|
||||
|
||||
IF (LIBZIP_FOUND)
|
||||
MESSAGE(STATUS "Found libzip: ${LIBZIP_LIBRARY}")
|
||||
|
@ -29,6 +29,7 @@ find_library(LIBTASN1_LIBRARY
|
||||
NAMES tasn1
|
||||
PATHS
|
||||
${LIB_DIR}
|
||||
$ENV{LIB_DIR}/lib
|
||||
"$ENV{LIB_DIR}"
|
||||
$ENV{LIB}
|
||||
/usr/local/lib
|
||||
|
@ -16,11 +16,11 @@ PKG_CHECK_MODULES(PC_MDAL QUIET libmdal)
|
||||
SET(MDAL_DEFINITIONS ${PC_MDAL_CFLAGS_OTHER})
|
||||
|
||||
FIND_PATH(MDAL_INCLUDE_DIR mdal.h
|
||||
HINTS ${PC_MDAL_INCLUDEDIR} ${PC_MDAL_INCLUDE_DIRS} ${MDAL_PREFIX}/include
|
||||
HINTS $ENV{LIB_DIR}/include ${PC_MDAL_INCLUDEDIR} ${PC_MDAL_INCLUDE_DIRS} ${MDAL_PREFIX}/include
|
||||
PATH_SUFFIXES libmdal )
|
||||
|
||||
FIND_LIBRARY(MDAL_LIBRARY NAMES mdal libmdal
|
||||
HINTS ${PC_MDAL_LIBDIR} ${PC_MDAL_LIBRARY_DIRS} ${MDAL_PREFIX}/lib)
|
||||
HINTS $ENV{LIB_DIR}/lib ${PC_MDAL_LIBDIR} ${PC_MDAL_LIBRARY_DIRS} ${MDAL_PREFIX}/lib)
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MDAL DEFAULT_MSG
|
||||
|
@ -27,6 +27,7 @@ FIND_PATH( ${THIS_OSGEARTH_INCLUDE_DIR} ${THIS_OSGEARTH_INCLUDE_FILE}
|
||||
$ENV{OSGEARTHDIR}
|
||||
$ENV{OSGEARTH_DIR}
|
||||
$ENV{OSGEO4W_ROOT}
|
||||
$ENV{LIB_DIR}
|
||||
/usr/local/
|
||||
/usr/
|
||||
/sw/ # Fink
|
||||
@ -62,6 +63,7 @@ FIND_LIBRARY(${MYLIBRARY}
|
||||
$ENV{OSGEO4W_ROOT}
|
||||
~/Library/Frameworks
|
||||
/Library/Frameworks
|
||||
$ENV{LIB_DIR}
|
||||
/usr/local
|
||||
/usr
|
||||
/sw
|
||||
|
@ -35,8 +35,8 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND EXISTS "${PYTHON_LIBRARY}" AND EXISTS "
|
||||
|
||||
if(PYTHONINTERP_FOUND)
|
||||
FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH} NO_CMAKE_FIND_ROOT_PATH)
|
||||
|
||||
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_lib_python_py} OUTPUT_VARIABLE python_config)
|
||||
|
||||
if(python_config)
|
||||
STRING(REGEX REPLACE ".*exec_prefix:([^\n]+).*$" "\\1" PYTHON_PREFIX ${python_config})
|
||||
STRING(REGEX REPLACE ".*\nshort_version:([^\n]+).*$" "\\1" PYTHON_SHORT_VERSION ${python_config})
|
||||
@ -54,8 +54,11 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND EXISTS "${PYTHON_LIBRARY}" AND EXISTS "
|
||||
if(WIN32)
|
||||
STRING(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
|
||||
FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs)
|
||||
elseif(APPLE AND QGIS_MAC_DEPS_DIR)
|
||||
FIND_LIBRARY(PYTHON_LIBRARY python${PYTHON_SHORT_VERSION}m PATHS $ENV{LIB_DIR}/lib)
|
||||
else(WIN32)
|
||||
FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES})
|
||||
endif(WIN32)
|
||||
FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES})
|
||||
set(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE_PATH} CACHE FILEPATH "Directory holding the python.h include file" FORCE)
|
||||
set(PYTHONLIBRARY_FOUND TRUE)
|
||||
endif(python_config)
|
||||
|
@ -28,6 +28,7 @@ else(QCA_INCLUDE_DIR AND QCA_LIBRARY)
|
||||
${LIB_DIR}
|
||||
$ENV{LIB}
|
||||
"$ENV{LIB_DIR}"
|
||||
$ENV{LIB_DIR}/lib
|
||||
/usr/local/lib
|
||||
)
|
||||
|
||||
|
@ -38,6 +38,7 @@ ELSE(QSCINTILLA_VERSION_STR)
|
||||
NAMES ${QSCINTILLA_LIBRARY_NAMES}
|
||||
PATHS
|
||||
"${QT_LIBRARY_DIR}"
|
||||
$ENV{LIB_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/local/lib/qt5
|
||||
/usr/lib
|
||||
@ -54,6 +55,7 @@ ELSE(QSCINTILLA_VERSION_STR)
|
||||
"${_qsci_fw}/Headers"
|
||||
${Qt5Core_INCLUDE_DIRS}
|
||||
"${QT_INCLUDE_DIR}"
|
||||
$ENV{LIB_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
PATH_SUFFIXES qt
|
||||
|
@ -28,6 +28,7 @@ FIND_LIBRARY(QTKEYCHAIN_LIBRARY NAMES qt5keychain qtkeychain
|
||||
PATHS
|
||||
${LIB_DIR}
|
||||
"$ENV{LIB_DIR}"
|
||||
$ENV{LIB_DIR}/lib
|
||||
$ENV{LIB}
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
# try to use framework on mac
|
||||
# want clean framework path, not unix compatibility path
|
||||
IF (APPLE)
|
||||
IF (APPLE AND NOT QGIS_MAC_DEPS_DIR)
|
||||
IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
|
||||
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
|
||||
OR NOT CMAKE_FIND_FRAMEWORK)
|
||||
@ -35,18 +35,28 @@ IF (APPLE)
|
||||
ENDIF (SQLITE3_LIBRARY)
|
||||
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
|
||||
ENDIF ()
|
||||
ENDIF (APPLE)
|
||||
ENDIF (APPLE AND NOT QGIS_MAC_DEPS_DIR)
|
||||
|
||||
# FIND_PATH and FIND_LIBRARY normally search standard locations
|
||||
# before the specified paths. To search non-standard paths first,
|
||||
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
|
||||
# and then again with no specified paths to search the default
|
||||
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
|
||||
# searching for the same item do nothing.
|
||||
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
|
||||
"$ENV{LIB_DIR}/include"
|
||||
"$ENV{LIB_DIR}/include/sqlite"
|
||||
"$ENV{INCLUDE}"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
|
||||
|
||||
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3 PATHS
|
||||
"$ENV{LIB_DIR}/lib"
|
||||
"$ENV{LIB}/lib"
|
||||
)
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3)
|
||||
|
||||
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
|
||||
SET(SQLITE3_FOUND TRUE)
|
||||
|
@ -14,12 +14,15 @@ MACRO(FIND_FLEX)
|
||||
NAMES flex.exe
|
||||
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
|
||||
)
|
||||
ELSEIF(APPLE AND QGIS_MAC_DEPS_DIR)
|
||||
FIND_PROGRAM(FLEX_EXECUTABLE flex PATHS $ENV{LIB_DIR}/bin NO_DEFAULT_PATH)
|
||||
ELSE(MSVC)
|
||||
FIND_PROGRAM(FLEX_EXECUTABLE flex)
|
||||
ENDIF (MSVC)
|
||||
IF (NOT FLEX_EXECUTABLE)
|
||||
MESSAGE(FATAL_ERROR "flex not found - aborting")
|
||||
ENDIF (NOT FLEX_EXECUTABLE)
|
||||
|
||||
IF (NOT FLEX_EXECUTABLE)
|
||||
MESSAGE(FATAL_ERROR "flex not found - aborting")
|
||||
ENDIF (NOT FLEX_EXECUTABLE)
|
||||
ENDIF(NOT FLEX_EXECUTABLE)
|
||||
ENDMACRO(FIND_FLEX)
|
||||
|
||||
|
@ -15,7 +15,7 @@ IF(NOT PYUIC_PROGRAM)
|
||||
PATHS $ENV{LIB_DIR}/bin
|
||||
)
|
||||
ELSE(MSVC)
|
||||
FIND_PROGRAM(PYUIC_PROGRAM NAMES ${PYUIC_PROG_NAMES})
|
||||
FIND_PROGRAM(PYUIC_PROGRAM NAMES ${PYUIC_PROG_NAMES} PATHS $ENV{LIB_DIR}/bin)
|
||||
ENDIF (MSVC)
|
||||
|
||||
IF (NOT PYUIC_PROGRAM)
|
||||
@ -59,7 +59,7 @@ IF(NOT PYRCC_PROGRAM)
|
||||
PATHS $ENV{LIB_DIR}/bin
|
||||
)
|
||||
ELSE(MSVC)
|
||||
FIND_PROGRAM(PYRCC_PROGRAM ${PYRCC_PROG_NAME})
|
||||
FIND_PROGRAM(PYRCC_PROGRAM ${PYRCC_PROG_NAME} PATHS $ENV{LIB_DIR}/bin)
|
||||
ENDIF (MSVC)
|
||||
|
||||
IF (NOT PYRCC_PROGRAM)
|
||||
|
10
external/mdal/cmake/FindNetCDF.cmake
vendored
10
external/mdal/cmake/FindNetCDF.cmake
vendored
@ -18,12 +18,12 @@ PKG_CHECK_MODULES(PC_NETCDF QUIET netcdf)
|
||||
SET(NETCDF_DEFINITIONS ${PC_NETCDF_CFLAGS_OTHER})
|
||||
|
||||
FIND_PATH (NETCDF_INCLUDE_DIR netcdf.h
|
||||
HINTS ${PC_NETCDF_INCLUDEDIR} ${PC_NETCDF_INCLUDE_DIRS} ${NETCDF_PREFIX}/include
|
||||
HINTS $ENV{LIB_DIR}/include ${PC_NETCDF_INCLUDEDIR} ${PC_NETCDF_INCLUDE_DIRS} ${NETCDF_PREFIX}/include
|
||||
PATH_SUFFIXES libnetcdf )
|
||||
|
||||
FIND_LIBRARY (NETCDF_LIBRARY
|
||||
NAMES netcdf libnetcdf
|
||||
HINTS HINTS ${PC_NETCDF_LIBDIR} ${PC_NETCDF_LIBRARY_DIRS} ${NETCDF_PREFIX}/lib)
|
||||
|
||||
FIND_LIBRARY (NETCDF_LIBRARY
|
||||
NAMES netcdf libnetcdf
|
||||
HINTS $ENV{LIB_DIR}/lib ${PC_NETCDF_LIBDIR} ${PC_NETCDF_LIBRARY_DIRS} ${NETCDF_PREFIX}/lib)
|
||||
|
||||
INCLUDE (FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS (NetCDF
|
||||
|
@ -1,6 +1,6 @@
|
||||
# mac bundling must happen at end, so all binaries installed
|
||||
# and install_names can be adjusted
|
||||
IF (APPLE)
|
||||
IF (APPLE AND QGIS_MACAPP_BUNDLE GREATER -1)
|
||||
# for included scripts that set policies (ie OS X bundling)
|
||||
INSTALL (CODE "cmake_policy(SET CMP0011 NEW)")
|
||||
CONFIGURE_FILE (cmake/0vars.cmake.in 0vars.cmake @ONLY)
|
||||
@ -30,4 +30,4 @@ IF (APPLE)
|
||||
ENDIF (QGIS_MACAPP_BUNDLE_USER)
|
||||
# tickle app bundle
|
||||
INSTALL (CODE "EXECUTE_PROCESS(COMMAND touch \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../../.\")")
|
||||
ENDIF (APPLE)
|
||||
ENDIF (APPLE AND QGIS_MACAPP_BUNDLE GREATER -1)
|
||||
|
@ -5,6 +5,7 @@ application package and fixing up the library paths. It is automatic during
|
||||
installation. There are 2 levels currently, specified with the cmake config
|
||||
option QGIS_MACAPP_BUNDLE, and one that always occurs:
|
||||
|
||||
-1 = do not run bundle install scrips
|
||||
0 = (default) fixup the library paths for all QGIS libraries if @loader_path
|
||||
is available in the system (OS X 10.5+)
|
||||
1 = bundle Qt, PyQt, PyQwt and OSG/osgEarth
|
||||
|
Loading…
x
Reference in New Issue
Block a user