|
1 | 1 | SET(CPACK_PACKAGE_VERSION_MAJOR "1") |
2 | | -SET(CPACK_PACKAGE_VERSION_MINOR "2") |
| 2 | +SET(CPACK_PACKAGE_VERSION_MINOR "3") |
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 "Daphnis") |
| 5 | +SET(RELEASE_NAME "Unstable") |
6 | 6 | SET(PROJECT_VERSION ${COMPLETE_VERSION}) |
7 | 7 | PROJECT(qgis${PROJECT_VERSION}) |
8 | 8 | # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0 |
9 | | -SET(QGIS_VERSION_INT 10200) |
| 9 | +SET(QGIS_VERSION_INT 10300) |
10 | 10 |
|
11 | 11 | # TODO: |
12 | 12 | # - install includes for libs |
@@ -340,20 +340,33 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui) |
340 | 340 |
|
341 | 341 | FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn) |
342 | 342 |
|
343 | | -IF (NOT SVN_MARKER) |
344 | | - SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt) # Dummy file |
345 | | -ENDIF (NOT SVN_MARKER) |
346 | | - # Add a custom command to drive the svn script whenever the svn entries |
347 | | - # file changes. |
348 | | - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/svnscript.cmake.in_cmake |
349 | | - ${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake |
350 | | - @ONLY) |
351 | | - |
352 | | - ADD_CUSTOM_COMMAND ( |
353 | | - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h |
354 | | - DEPENDS ${SVN_MARKER} |
355 | | - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake |
356 | | -) |
| 343 | +IF (SVN_MARKER) |
| 344 | + # See if we have svn installed |
| 345 | + FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin) |
| 346 | + |
| 347 | + IF(SVNVERSION) |
| 348 | + IF(MSVC) |
| 349 | + ADD_CUSTOM_COMMAND( |
| 350 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h |
| 351 | + COMMAND for /f usebackq %%a in "(`\"${SVNVERSION}\"`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h |
| 352 | + MAIN_DEPENDENCY ${SVN_MARKER} |
| 353 | + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} |
| 354 | + ) |
| 355 | + ELSE(MSVC) |
| 356 | + ADD_CUSTOM_COMMAND( |
| 357 | + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h |
| 358 | + COMMAND echo \\\#define QGSSVNVERSION \\\"`${SVNVERSION}`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h |
| 359 | + MAIN_DEPENDENCY ${SVN_MARKER} |
| 360 | + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} |
| 361 | + ) |
| 362 | + ENDIF(MSVC) |
| 363 | + ELSE(SVNVERSION) |
| 364 | + MESSAGE(STATUS "svnversion not found - version will be unknown") |
| 365 | + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"") |
| 366 | + ENDIF (SVNVERSION) |
| 367 | +ELSE (SVN_MARKER) |
| 368 | + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"") |
| 369 | +ENDIF (SVN_MARKER) |
357 | 370 |
|
358 | 371 | ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h) |
359 | 372 |
|
|
0 commit comments