Skip to content

Commit

Permalink
fix 8a2ea36
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 9, 2012
1 parent 39e4c16 commit 2903704
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ ENDIF(NOT WIN32 AND NOT ANDROID)
FIND_PACKAGE(Proj)
FIND_PACKAGE(GEOS)
FIND_PACKAGE(GDAL)
FIND_PACKAGE(Expat)

IF (NOT WITH_INTERNAL_SPATIALINDEX)
FIND_PACKAGE(Spatialindex REQUIRED)
Expand Down
5 changes: 4 additions & 1 deletion src/plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ ADD_SUBDIRECTORY(sqlanywhere)
ADD_SUBDIRECTORY(roadgraph)
ADD_SUBDIRECTORY(zonal_statistics)
ADD_SUBDIRECTORY(georeferencer)
ADD_SUBDIRECTORY(gps_importer)

IF (WITH_SPATIALITE)
ADD_SUBDIRECTORY(offline_editing)
Expand All @@ -29,6 +28,10 @@ IF (GRASS_FOUND)
ADD_SUBDIRECTORY(grass)
ENDIF (GRASS_FOUND)

IF(EXPAT_FOUND)
ADD_SUBDIRECTORY(gps_importer)
ENDIF(EXPAT_FOUND)

IF (WITH_GLOBE)
ADD_SUBDIRECTORY(globe)
ENDIF (WITH_GLOBE)
Expand Down
6 changes: 0 additions & 6 deletions src/plugins/gps_importer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
FIND_PACKAGE(Expat) # GPS importer plugin

IF(EXPAT_FOUND)

########################################################
# Files

Expand Down Expand Up @@ -60,5 +56,3 @@ TARGET_LINK_LIBRARIES(gpsimporterplugin
INSTALL(TARGETS gpsimporterplugin
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})

ENDIF(EXPAT_FOUND)

0 comments on commit 2903704

Please sign in to comment.