Skip to content

Commit 2903704

Browse files
committed
fix 8a2ea36
1 parent 39e4c16 commit 2903704

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ ENDIF(NOT WIN32 AND NOT ANDROID)
138138
FIND_PACKAGE(Proj)
139139
FIND_PACKAGE(GEOS)
140140
FIND_PACKAGE(GDAL)
141+
FIND_PACKAGE(Expat)
141142

142143
IF (NOT WITH_INTERNAL_SPATIALINDEX)
143144
FIND_PACKAGE(Spatialindex REQUIRED)

src/plugins/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ADD_SUBDIRECTORY(sqlanywhere)
1515
ADD_SUBDIRECTORY(roadgraph)
1616
ADD_SUBDIRECTORY(zonal_statistics)
1717
ADD_SUBDIRECTORY(georeferencer)
18-
ADD_SUBDIRECTORY(gps_importer)
1918

2019
IF (WITH_SPATIALITE)
2120
ADD_SUBDIRECTORY(offline_editing)
@@ -29,6 +28,10 @@ IF (GRASS_FOUND)
2928
ADD_SUBDIRECTORY(grass)
3029
ENDIF (GRASS_FOUND)
3130

31+
IF(EXPAT_FOUND)
32+
ADD_SUBDIRECTORY(gps_importer)
33+
ENDIF(EXPAT_FOUND)
34+
3235
IF (WITH_GLOBE)
3336
ADD_SUBDIRECTORY(globe)
3437
ENDIF (WITH_GLOBE)

src/plugins/gps_importer/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
FIND_PACKAGE(Expat) # GPS importer plugin
2-
3-
IF(EXPAT_FOUND)
4-
51
########################################################
62
# Files
73

@@ -60,5 +56,3 @@ TARGET_LINK_LIBRARIES(gpsimporterplugin
6056
INSTALL(TARGETS gpsimporterplugin
6157
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
6258
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
63-
64-
ENDIF(EXPAT_FOUND)

0 commit comments

Comments
 (0)