Skip to content
Permalink
Browse files
remove unused define (followup 841af77)
  • Loading branch information
jef-n committed Jan 4, 2015
1 parent b396af0 commit b905f6bb7946410eaed8d091d9a7074cdb0c4f5d
Showing with 30 additions and 36 deletions.
  1. +0 −2 src/analysis/CMakeLists.txt
  2. +7 −13 src/app/CMakeLists.txt
  3. +0 −2 src/core/CMakeLists.txt
  4. +23 −19 src/plugins/offline_editing/CMakeLists.txt
@@ -56,8 +56,6 @@ INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
INCLUDE_DIRECTORIES(BEFORE raster)

ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)

ADD_FLEX_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalclexer.ll)

ADD_BISON_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalcparser.yy)
@@ -448,6 +448,12 @@ INCLUDE_DIRECTORIES(
../python
gps
openstreetmap
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${QWTPOLAR_INCLUDE_DIR}
)

IF(ENABLE_MODELTEST)
@@ -458,17 +464,6 @@ IF (ANDROID)
INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
ENDIF (ANDROID)

INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)

INCLUDE_DIRECTORIES(
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${QWTPOLAR_INCLUDE_DIR}
)

IF (POSTGRES_FOUND)
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
ENDIF (POSTGRES_FOUND)
@@ -480,10 +475,9 @@ ELSE (ANDROID)
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 main.cpp ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ENDIF (ANDROID)


QT4_WRAP_CPP(tst_moc_srcs maprenderertest.h)
ADD_EXECUTABLE(maprenderertest maprenderertest.cpp ${tst_moc_srcs})
TARGET_LINK_LIBRARIES(maprenderertest qgis_core qgis_gui)
TARGET_LINK_LIBRARIES(maprenderertest qgis_core qgis_gui)

IF (WIN32)
IF (MSVC)
@@ -323,8 +323,6 @@ IF (QT_MOBILITY_LOCATION_FOUND)
)
ENDIF (QT_MOBILITY_LOCATION_FOUND)

ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)

ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll)

ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy)
@@ -24,36 +24,40 @@ SET (offline_editing_plugin_RCCS offline_editing_plugin.qrc)
########################################################
# Build

QT4_WRAP_UI (offline_editing_plugin_UIS_H ${offline_editing_plugin_UIS})
QT4_WRAP_UI(offline_editing_plugin_UIS_H ${offline_editing_plugin_UIS})

QT4_WRAP_CPP (offline_editing_plugin_MOC_SRCS ${offline_editing_plugin_MOC_HDRS})
QT4_WRAP_CPP(offline_editing_plugin_MOC_SRCS ${offline_editing_plugin_MOC_HDRS})

QT4_ADD_RESOURCES(offline_editing_plugin_RCC_SRCS ${offline_editing_plugin_RCCS})

ADD_LIBRARY (offlineeditingplugin MODULE ${offline_editing_plugin_SRCS} ${offline_editing_plugin_MOC_SRCS} ${offline_editing_plugin_RCC_SRCS} ${offline_editing_plugin_UIS_H})

TARGET_LINK_LIBRARIES(offlineeditingplugin ${SPATIALITE_LIBRARY})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)

INCLUDE_DIRECTORIES(
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster
../../gui
..
${GEOS_INCLUDE_DIR}
ADD_LIBRARY (offlineeditingplugin MODULE
${offline_editing_plugin_SRCS}
${offline_editing_plugin_MOC_SRCS}
${offline_editing_plugin_RCC_SRCS}
${offline_editing_plugin_UIS_H}
)

TARGET_LINK_LIBRARIES(offlineeditingplugin
qgis_core
qgis_gui
qgis_core
qgis_gui
${SPATIALITE_LIBRARY}
)

INCLUDE_DIRECTORIES(
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
../../core
../../core/raster
../../gui
..
${GEOS_INCLUDE_DIR}
)

########################################################
# Install

INSTALL(TARGETS offlineeditingplugin
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}
)

0 comments on commit b905f6b

Please sign in to comment.