Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
remove trailing whitespaces from CMakeLists.txt
- Loading branch information
|
@@ -729,11 +729,11 @@ if (WITH_CORE) |
|
|
set (DEFAULT_CGIBIN_SUBDIR .) |
|
|
endif() |
|
|
else() |
|
|
|
|
|
|
|
|
if(APPLE) |
|
|
set(QGIS_MACAPP_FRAMEWORK TRUE CACHE BOOL "Build as a framework on OSX") |
|
|
endif() |
|
|
|
|
|
|
|
|
if (APPLE AND QGIS_MACAPP_FRAMEWORK) |
|
|
if (POLICY CMP0042) # in CMake 3.0.0+ |
|
|
set (CMAKE_MACOSX_RPATH OFF) # otherwise ON by default |
|
@@ -807,7 +807,7 @@ if (WITH_CORE) |
|
|
set (DEFAULT_QML_SUBDIR qml) |
|
|
|
|
|
set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server) |
|
|
|
|
|
|
|
|
# QGIS_MACAPP_FRAMEWORK=FALSE |
|
|
if(APPLE) |
|
|
set (QGIS_MACAPP_BUNDLE -1) |
|
|
|
@@ -21,7 +21,7 @@ endif(o2_WITH_QT5) |
|
|
if (NOT o2_WITH_QT5) |
|
|
include( ${QT_USE_FILE} ) |
|
|
endif(NOT o2_WITH_QT5) |
|
|
|
|
|
|
|
|
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} "../../src" ) |
|
|
|
|
|
set(fb_SRCS |
|
|
|
@@ -26,7 +26,7 @@ set (SVG_DIRS |
|
|
transport |
|
|
wind_roses |
|
|
) |
|
|
|
|
|
|
|
|
foreach (SVG_DIR ${SVG_DIRS}) |
|
|
file(GLOB_RECURSE IMAGES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${SVG_DIR}/*.svg) |
|
|
set(SVG_FILES ${SVG_FILES} ${IMAGES}) |
|
|
|
@@ -171,8 +171,8 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION) |
|
|
set_target_properties(grassrasterprovider${GRASS_BUILD_VERSION} PROPERTIES |
|
|
COMPILE_FLAGS "-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\"" |
|
|
) |
|
|
target_link_libraries(grassrasterprovider${GRASS_BUILD_VERSION} |
|
|
qgisgrass${GRASS_BUILD_VERSION} |
|
|
target_link_libraries(grassrasterprovider${GRASS_BUILD_VERSION} |
|
|
qgisgrass${GRASS_BUILD_VERSION} |
|
|
qgis_core |
|
|
) |
|
|
|
|
|
|
@@ -146,7 +146,7 @@ else() |
|
|
target_link_libraries (postgresprovider |
|
|
qgis_gui |
|
|
) |
|
|
add_dependencies(postgresprovider ui) |
|
|
add_dependencies(postgresprovider ui) |
|
|
endif() |
|
|
|
|
|
|
|
|
|
@@ -3,7 +3,7 @@ |
|
|
##################################################### |
|
|
# Don't forget to include output directory, otherwise |
|
|
# the UI file won't be wrapped! |
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} |
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} |
|
|
${CMAKE_CURRENT_BINARY_DIR} |
|
|
${CMAKE_SOURCE_DIR}/src/test |
|
|
${CMAKE_SOURCE_DIR}/src/plugins |
|
@@ -18,7 +18,7 @@ include_directories(SYSTEM |
|
|
#qtests in the executable file list as the moc is |
|
|
#directly included in the sources |
|
|
#and should not be compiled twice. Trying to include |
|
|
#them in will cause an error at build time |
|
|
#them in will cause an error at build time |
|
|
|
|
|
#No relinking and full RPATH for the install tree |
|
|
#See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree |
|
|
|
@@ -3,7 +3,7 @@ |
|
|
##################################################### |
|
|
# Don't forget to include output directory, otherwise |
|
|
# the UI file won't be wrapped! |
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} |
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR} |
|
|
${CMAKE_CURRENT_BINARY_DIR} |
|
|
${CMAKE_SOURCE_DIR}/src/providers/wms |
|
|
${CMAKE_SOURCE_DIR}/src/providers/postgres |
|
@@ -20,7 +20,7 @@ include_directories(SYSTEM |
|
|
#qtests in the executable file list as the moc is |
|
|
#directly included in the sources |
|
|
#and should not be compiled twice. Trying to include |
|
|
#them in will cause an error at build time |
|
|
#them in will cause an error at build time |
|
|
|
|
|
#No relinking and full RPATH for the install tree |
|
|
#See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree |
|
|