fix version variable name

With project() managing version, they are now called KDevelop_VERSION_FOO instead of KDEVELOP_VERSION_FOO.

fix version variable name
With project() managing version, they are now called KDevelop_VERSION_FOO instead of KDEVELOP_VERSION_FOO.
af22e970 · Sven Brauch · 845aa073 · af22e970 · af22e970 · af22e970
Commit af22e970 authored Sep 29, 2017 by Sven Brauch
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

CMakeLists.txt CMakeLists.txt +1 -1

app/CMakeLists.txt app/CMakeLists.txt +3 -3

config-kdevelop.h.cmake config-kdevelop.h.cmake +4 -4

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KDevelopConfig.cmake.
                                  "${CMAKE_CURRENT_BINARY_DIR}/KDevelopConfig.cmake"
                                  INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
 )
-ecm_setup_version(${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}.${KDEVELOP_VERSION_PATCH}
+ecm_setup_version(${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}.${KDevelop_VERSION_PATCH}
                  VARIABLE_PREFIX KDEVELOP
                  VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdevelop_version.h"
                  PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDevelopConfigVersion.cmake"

--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -84,9 +84,9 @@ if (APPLE)
    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDevelop")
    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "KDevelop")
    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_STRING "The KDevelop Integrated Development Environment")
-    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
-    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
-    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
+    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}")
+    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}")
+    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}")
    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_ICON_FILE "kdevelop_SRCS.icns")
    set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_COPYRIGHT "KDevelop Team")
 endif (APPLE)

--- a/config-kdevelop.h.cmake
+++ b/config-kdevelop.h.cmake
@@ -3,10 +3,10 @@

 /* config-kdevelop.h.  Generated by cmake from config-kdevelop.h.cmake */

-#define VERSION "@KDEVELOP_VERSION_MAJOR@.@KDEVELOP_VERSION_MINOR@.@KDEVELOP_VERSION_PATCH@"
-#define VERSION_MAJOR "@KDEVELOP_VERSION_MAJOR@"
-#define VERSION_MINOR "@KDEVELOP_VERSION_MINOR@"
-#define VERSION_PATCH "@KDEVELOP_VERSION_PATCH@"
+#define VERSION "@KDevelop_VERSION_MAJOR@.@KDevelop_VERSION_MINOR@.@KDevelop_VERSION_PATCH@"
+#define VERSION_MAJOR "@KDevelop_VERSION_MAJOR@"
+#define VERSION_MINOR "@KDevelop_VERSION_MINOR@"
+#define VERSION_PATCH "@KDevelop_VERSION_PATCH@"

 #cmakedefine01 KDEVELOP_SINGLE_APP