@@ -2,7 +2,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
2
2
SET (CPACK_PACKAGE_VERSION_MINOR "1" )
3
3
SET (CPACK_PACKAGE_VERSION_PATCH "0" )
4
4
SET (COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR} .${CPACK_PACKAGE_VERSION_MINOR} .${CPACK_PACKAGE_VERSION_PATCH} )
5
- SET (RELEASE_NAME "Unstable-trunk " )
5
+ SET (RELEASE_NAME "Pan ( Unstable) " )
6
6
SET (PROJECT_VERSION ${COMPLETE_VERSION} )
7
7
PROJECT (qgis${PROJECT_VERSION} )
8
8
SET (QGIS_VERSION_INT 10000)
@@ -333,9 +333,12 @@ ENDIF (UNIX)
333
333
334
334
CONFIGURE_FILE (${CMAKE_SOURCE_DIR} /cmake_templates/qgsconfig.h.in ${CMAKE_BINARY_DIR} /qgsconfig.h)
335
335
INSTALL (FILES ${CMAKE_BINARY_DIR} /qgsconfig.h DESTINATION ${QGIS_INCLUDE_DIR} )
336
-
337
336
INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR} )
338
337
338
+ # Added by Jef to prevent python core and gui libs linking to other qgisCore and qgisGui libs
339
+ # that may be in the same install prefix
340
+ LINK_DIRECTORIES (${CMAKE_BINARY_DIR} /src/core ${CMAKE_BINARY_DIR} /src/gui)
341
+
339
342
#############################################################
340
343
# create qgssvnversion.h
341
344
@@ -380,7 +383,7 @@ ENDIF (ENABLE_TESTS)
380
383
#############################################################
381
384
# install stuff
382
385
383
- INSTALL (FILES AUTHORS SPONSORS INSTALL CODING
386
+ INSTALL (FILES AUTHORS SPONSORS TRANSLATORS INSTALL CODING
384
387
DESTINATION ${QGIS_DATA_DIR} /doc )
385
388
386
389
# manual page - makes sense only on unix systems
0 commit comments