Skip to content

Commit 6d90708

Browse files
jef-njef-n
committedJul 5, 2011
fix windows build
1 parent 97f8039 commit 6d90708

File tree

5 files changed

+56
-56
lines changed

5 files changed

+56
-56
lines changed
 

‎cmake/FindQGIS.cmake

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
## Once run this will define:
2-
##
1+
## Once run this will define:
2+
##
33
## QGIS_FOUND = system has QGIS lib
44
##
55
## QGIS_CORE_LIBRARY = full path to the CORE library
66
## QGIS_GUI_LIBRARY = full path to the GUI library
77
## QGIS_ANALYSIS_LIBRARY = full path to the ANALYSIS library
88
## QGIS_PLUGIN_DIR = full path to where QGIS plugins are installed
9-
## QGIS_INCLUDE_DIR = where to find headers
9+
## QGIS_INCLUDE_DIR = where to find headers
1010
##
1111
## Tim Sutton
1212

@@ -20,9 +20,9 @@ IF(WIN32)
2020
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
2121
)
2222
FIND_PATH(QGIS_INCLUDE_DIR
23-
NAMES qgsapplication.h
23+
NAMES qgsapplication.h
2424
PATHS
25-
"$ENV{PROGRAMFILES}/Quantum GIS/include"
25+
"$ENV{PROGRAMFILES}/Quantum GIS/include"
2626
)
2727
FIND_LIBRARY(QGIS_CORE_LIBRARY
2828
NAMES qgis_core
@@ -43,41 +43,41 @@ IF(WIN32)
4343
"$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
4444
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
4545
)
46-
FIND_PATH(QGIS_INCLUDE_DIR
47-
NAMES qgsapplication.h
46+
FIND_PATH(QGIS_INCLUDE_DIR
47+
NAMES qgsapplication.h
4848
PATHS
49-
"$ENV{INCLUDE}"
50-
"$ENV{LIB_DIR}/include/qgis"
49+
"$ENV{INCLUDE}"
50+
"$ENV{LIB_DIR}/include/qgis"
5151
"$ENV{OSGEO4W_ROOT}/include"
5252
"$ENV{PROGRAMFILES}/Quantum GIS/include"
5353
)
5454
FIND_LIBRARY(QGIS_CORE_LIBRARY
5555
NAMES qgis_core
56-
PATHS
57-
"$ENV{LIB_DIR}/lib/"
58-
"$ENV{LIB}"
56+
PATHS
57+
"$ENV{LIB_DIR}/lib/"
58+
"$ENV{LIB}"
5959
"$ENV{OSGEO4W_ROOT}/lib"
6060
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
6161
)
6262
FIND_LIBRARY(QGIS_GUI_LIBRARY
6363
NAMES qgis_gui
64-
PATHS
65-
"$ENV{LIB_DIR}"
66-
"$ENV{LIB}"
64+
PATHS
65+
"$ENV{LIB_DIR}"
66+
"$ENV{LIB}"
6767
"$ENV{OSGEO4W_ROOT}/lib"
6868
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
6969
)
7070
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
7171
NAMES qgis_analysis
72-
PATHS
73-
"$ENV{LIB_DIR}"
74-
"$ENV{LIB}"
72+
PATHS
73+
"$ENV{LIB_DIR}"
74+
"$ENV{LIB}"
7575
"$ENV{OSGEO4W_ROOT}/lib"
7676
"$ENV{PROGRAMFILES}/Quantum GIS/lib"
7777
)
7878
ENDIF (MSVC)
7979
ELSE(WIN32)
80-
IF(UNIX)
80+
IF(UNIX)
8181
# try to use bundle on mac
8282
SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents)
8383
#MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
@@ -88,25 +88,25 @@ ELSE(WIN32)
8888
/usr/lib/qgis
8989
/usr/local/lib/qgis/plugins
9090
${QGIS_MAC_PATH}/PlugIns/qgis
91-
"$ENV{LIB_DIR}/lib/qgis/plugins"
92-
"$ENV{LIB_DIR}/lib/qgis"
91+
"$ENV{LIB_DIR}/lib/qgis/plugins"
92+
"$ENV{LIB_DIR}/lib/qgis"
9393
)
9494
FIND_PATH(QGIS_INCLUDE_DIR
95-
NAMES qgis.h
95+
NAMES qgis.h
9696
PATHS
9797
/usr/include/qgis
9898
/usr/local/include/qgis
9999
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
100-
"$ENV{LIB_DIR}/include/qgis"
100+
"$ENV{LIB_DIR}/include/qgis"
101101
)
102102
# also get other frameworks' headers folders on OS X
103103
IF (APPLE)
104104
FIND_PATH(QGIS_GUI_INCLUDE_DIR
105-
NAMES qgisgui.h
105+
NAMES qgisgui.h
106106
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
107107
)
108108
FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
109-
NAMES qgsinterpolator.h
109+
NAMES qgsinterpolator.h
110110
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
111111
)
112112
SET(QGIS_INCLUDE_DIR
@@ -117,30 +117,30 @@ ELSE(WIN32)
117117
ENDIF (APPLE)
118118
FIND_LIBRARY(QGIS_CORE_LIBRARY
119119
NAMES qgis_core
120-
PATHS
120+
PATHS
121121
/usr/lib64
122122
/usr/lib
123123
/usr/local/lib
124124
${QGIS_MAC_PATH}/Frameworks
125-
"$ENV{LIB_DIR}/lib/"
125+
"$ENV{LIB_DIR}/lib/"
126126
)
127127
FIND_LIBRARY(QGIS_GUI_LIBRARY
128128
NAMES qgis_gui
129-
PATHS
129+
PATHS
130130
/usr/lib64
131131
/usr/lib
132132
/usr/local/lib
133133
${QGIS_MAC_PATH}/Frameworks
134-
"$ENV{LIB_DIR}/lib/"
134+
"$ENV{LIB_DIR}/lib/"
135135
)
136136
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
137137
NAMES qgis_analysis
138-
PATHS
138+
PATHS
139139
/usr/lib64
140140
/usr/lib
141141
/usr/local/lib
142142
${QGIS_MAC_PATH}/Frameworks
143-
"$ENV{LIB_DIR}/lib/"
143+
"$ENV{LIB_DIR}/lib/"
144144
)
145145
ENDIF(UNIX)
146146
ENDIF(WIN32)

‎images/icons/CMakeLists.txt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
2-
FILE (GLOB IMAGES *.png)
3-
INSTALL (FILES ${IMAGES}
4-
DESTINATION ${QGIS_DATA_DIR}/images/icons)
5-
6-
IF(MSVC)
7-
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
8-
ENDIF(MSVC)
9-
10-
# OS X app/doc icons
11-
IF (APPLE)
12-
ADD_SUBDIRECTORY(mac)
13-
ENDIF (APPLE)
1+
2+
FILE (GLOB IMAGES *.png)
3+
INSTALL (FILES ${IMAGES}
4+
DESTINATION ${QGIS_DATA_DIR}/images/icons)
5+
6+
# OS X app/doc icons
7+
IF (APPLE)
8+
ADD_SUBDIRECTORY(mac)
9+
ENDIF (APPLE)

‎python/pyspatialite/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ IF (NOT APPLE)
3131
TARGET_LINK_LIBRARIES(pyspatialite ${PYTHON_LIBRARY})
3232
ENDIF (NOT APPLE)
3333

34-
TARGET_LINK_LIBRARIES(pyspatialite ${EXTRA_LINK_LIBRARIES})
34+
TARGET_LINK_LIBRARIES(pyspatialite qgis_core)
3535

3636
IF (APPLE)
3737
SET_TARGET_PROPERTIES(pyspatialite PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

‎src/app/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,10 @@ INSTALL(TARGETS ${QGIS_APP_NAME}
423423
BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX}
424424
RUNTIME DESTINATION ${QGIS_BIN_DIR})
425425

426+
IF (MSVC)
427+
INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
428+
ENDIF (MSVC)
429+
426430
IF (APPLE)
427431
INSTALL(CODE "EXECUTE_PROCESS(COMMAND /bin/echo -n \"APPLQGIS\" OUTPUT_FILE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../PkgInfo\")")
428432
ENDIF (APPLE)

‎src/core/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ SET(QGIS_CORE_SRCS
164164
symbology/qgssymbologyutils.cpp
165165

166166
spatialindex/qgsspatialindex.cpp
167-
167+
168168
)
169169

170170
IF(WIN32)
@@ -346,7 +346,7 @@ SET(QGIS_CORE_HDRS
346346
raster/qgsrastershader.h
347347
raster/qgsrastershaderfunction.h
348348
raster/qgsrasterviewport.h
349-
349+
350350
renderer/qgscontinuouscolorrenderer.h
351351
renderer/qgsgraduatedsymbolrenderer.h
352352
renderer/qgsrenderer.h
@@ -379,11 +379,11 @@ SET(QGIS_CORE_HDRS
379379
)
380380

381381
INCLUDE_DIRECTORIES(
382-
${CMAKE_CURRENT_SOURCE_DIR}
382+
${CMAKE_CURRENT_SOURCE_DIR}
383383
composer
384384
pal
385-
raster
386-
renderer
385+
raster
386+
renderer
387387
symbology
388388
spatialindex/include
389389
symbology-ng
@@ -465,12 +465,12 @@ IF(APPLE)
465465
ENDIF(APPLE)
466466

467467
TARGET_LINK_LIBRARIES(qgis_core
468-
${QT_QTMAIN_LIBRARY}
469-
${QT_QTXML_LIBRARY}
470-
${QT_QTCORE_LIBRARY}
471-
${QT_QTGUI_LIBRARY}
472-
${QT_QTNETWORK_LIBRARY}
473-
${QT_QTSVG_LIBRARY}
468+
${QT_QTMAIN_LIBRARY}
469+
${QT_QTXML_LIBRARY}
470+
${QT_QTCORE_LIBRARY}
471+
${QT_QTGUI_LIBRARY}
472+
${QT_QTNETWORK_LIBRARY}
473+
${QT_QTSVG_LIBRARY}
474474

475475
${PROJ_LIBRARY}
476476
${GEOS_LIBRARY}

0 commit comments

Comments
 (0)