Browse Source

Merge branch '66-use-ctk-patch-version'. Closes #66

* 66-use-ctk-patch-version:
  Use CTK_PATCH_VERSION instead of CTK_BUILD_VERSION. See #66
Jean-Christophe Fillion-Robin 13 years ago
parent
commit
6d7a49bd6d

+ 2 - 2
CMakeLists.txt

@@ -118,9 +118,9 @@ ENDFOREACH()
 #
 SET(CTK_MAJOR_VERSION 0)
 SET(CTK_MINOR_VERSION 1)
-SET(CTK_BUILD_VERSION 0)
+SET(CTK_PATCH_VERSION 0)
 SET(CTK_VERSION
-    "${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}.${CTK_BUILD_VERSION}")
+    "${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}.${CTK_PATCH_VERSION}")
 
 # Append the library version information to the library target
 # properties.  A parent project may set its own properties and/or may

+ 1 - 1
CTKConfig.cmake.in

@@ -138,7 +138,7 @@ SET(CTK_QT_QMAKE_EXECUTABLE "@QT_QMAKE_EXECUTABLE@")
 # The CTK version number
 SET(CTK_MAJOR_VERSION "@CTK_MAJOR_VERSION@")
 SET(CTK_MINOR_VERSION "@CTK_MINOR_VERSION@")
-SET(CTK_BUILD_VERSION "@CTK_BUILD_VERSION@")
+SET(CTK_PATCH_VERSION "@CTK_PATCH_VERSION@")
 
 # The location of the UseCTK.cmake file.
 SET(CTK_USE_FILE "@CTK_USE_FILE@")

+ 2 - 2
Utilities/CMake/FindCTK.cmake

@@ -26,7 +26,7 @@
 #  CTK_MAJOR_VERSION - The CTK major version number.
 #  CTK_MINOR_VERSION - The CTK minor version number
 #                       (odd non-release).
-#  CTK_BUILD_VERSION - The CTK patch level
+#  CTK_PATCH_VERSION - The CTK patch level
 #                       (meaningless for odd minor).
 #  CTK_INCLUDE_DIRS  - Include directories for CTK
 #  CTK_LIBRARY_DIRS  - Link directories for CTK libraries
@@ -62,4 +62,4 @@ IF(NOT CTK_FOUND)
       MESSAGE(STATUS ${CTK_DIR_MESSAGE})
     ENDIF(NOT CTK_FIND_QUIETLY)
   ENDIF(CTK_FIND_REQUIRED)
-ENDIF()
+ENDIF()

+ 1 - 1
Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -43,7 +43,7 @@ INCLUDE(ctkFunctionGeneratePluginUseFile)
 # Construct version numbers for CTKConfigVersion.cmake.
 SET(_CTK_VERSION_MAJOR ${CTK_MAJOR_VERSION})
 SET(_CTK_VERSION_MINOR ${CTK_MINOR_VERSION})
-SET(_CTK_VERSION_PATCH ${CTK_BUILD_VERSION})
+SET(_CTK_VERSION_PATCH ${CTK_PATCH_VERSION})
 # We use odd minor numbers for development versions.
 # Use a date for the development patch level.
 # IF("${_CTK_VERSION_MINOR}" MATCHES "[13579]$")