cmake: change 'Qaul' to 'QAUL' in cmake variables

qaul · Mar 9, 2016 · 40d7e83 · 40d7e83
1 parent 5cc8f41
commit 40d7e83
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,24 +13,24 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 include (ExternalProject)
 
 # The version number.
-set (Qaul_VERSION_MAJOR 1)
-set (Qaul_VERSION_MINOR 0)
-set (Qaul_VERSION_PATCH 0)
-set (Qaul_VERSION_SUFFIX "beta5")
-set (Qaul_VERSION "${Qaul_VERSION_MAJOR}.${Qaul_VERSION_MINOR}.${Qaul_VERSION_PATCH}.${Qaul_VERSION_SUFFIX}")
+set (QAUL_VERSION_MAJOR 1)
+set (QAUL_VERSION_MINOR 0)
+set (QAUL_VERSION_PATCH 0)
+set (QAUL_VERSION_SUFFIX "beta5")
+set (QAUL_VERSION "${QAUL_VERSION_MAJOR}.${QAUL_VERSION_MINOR}.${QAUL_VERSION_PATCH}.${QAUL_VERSION_SUFFIX}")
 
 # build configuration
 set (LOGLEVELS LOG_NONE LOG_ERROR LOG_WARN LOG_INFO LOG_DEBUG)
-set (Qaul_DEFAULT_LOGLEVEL "LOG_DEBUG" CACHE STRING "set the default log level (one of ${LOGLEVELS})")
-list (FIND LOGLEVELS ${Qaul_DEFAULT_LOGLEVEL} RET)
+set (QAUL_DEFAULT_LOGLEVEL "LOG_DEBUG" CACHE STRING "set the default log level (one of ${LOGLEVELS})")
+list (FIND LOGLEVELS ${QAUL_DEFAULT_LOGLEVEL} RET)
 if (${RET} EQUAL -1)
 	message(FATAL_ERROR "Please choose which log level to include (one of ${LOGLEVELS})")
 endif ()
 
 # install configuration
-set (Qaul_DESKTOPDIR "/usr/share/applications" CACHE STRING "choose install location for the .desktop file")
-set (Qaul_ICONDIR "${CMAKE_INSTALL_PREFIX}/lib/qaul/icons" CACHE STRING "choose install location for the aplication icon file(s)")
-set (Qaul_BINDIR "NONE" CACHE STRING "if set a wrapper shell script will be installed here")
+set (QAUL_DESKTOPDIR "/usr/share/applications" CACHE STRING "choose install location for the .desktop file")
+set (QAUL_ICONDIR "${CMAKE_INSTALL_PREFIX}/lib/qaul/icons" CACHE STRING "choose install location for the aplication icon file(s)")
+set (QAUL_BINDIR "NONE" CACHE STRING "if set a wrapper shell script will be installed here")
 
 # What to build
 # Determine the operating system
@@ -98,10 +98,10 @@ set(PKGFORMAT "AUTO" CACHE STRING "select what type of package should be build (
 # Cpack general Installer settings
 set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/Licenses/qaul.net_license.txt)
 set(CPACK_PACKAGE_VENDOR "qaul.net community")
-set(CPACK_PACKAGE_VERSION_MAJOR ${Qaul_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${Qaul_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${Qaul_VERSION_PATCH})
-set(CPACK_PACKAGE_VERSION_SUFFIX ${Qaul_VERSION_SUFFIX})
+set(CPACK_PACKAGE_VERSION_MAJOR ${QAUL_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${QAUL_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${QAUL_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION_SUFFIX ${QAUL_VERSION_SUFFIX})
 set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CPACK_PACKAGE_VERSION_SUFFIX})
 
 # configure a header file to pass some of the CMake settings
@@ -167,7 +167,7 @@ message(STATUS "    Building for platform: ${PORT}")
 message(STATUS "    Building GUI: ${GUI}")
 message(STATUS "    Arm/Raspberry patches enabled: ${Raspberry}")
 message(STATUS "    Qaul executable: ${GUINAME}")
-message(STATUS "    Default loglevel: ${Qaul_DEFAULT_LOGLEVEL}")
+message(STATUS "    Default loglevel: ${QAUL_DEFAULT_LOGLEVEL}")
 message(STATUS "#############################################")
 
 message(STATUS "*****************************************************************")
@@ -200,4 +200,4 @@ elseif (${PORT} STREQUAL "WINDOWS")
     message(STATUS "set the qaul project as your start up project in Visual Studio:")
     message(STATUS "Right-click on the qaul project icon and select: Set as StartUp Project.")
 endif()
-message(STATUS "*****************************************************************")
+message(STATUS "*****************************************************************")
diff --git a/cmake/BuildLinux.cmake b/cmake/BuildLinux.cmake
@@ -31,7 +31,7 @@ configure_file (
   "${PROJECT_BINARY_DIR}/distfiles/linux/bin/${GUINAME}"
 )
 
-if (NOT ${Qaul_BINDIR} STREQUAL "NONE")
+if (NOT ${QAUL_BINDIR} STREQUAL "NONE")
   install(FILES ${PROJECT_BINARY_DIR}/distfiles/linux/bin/${GUINAME} DESTINATION ${Qaul_BINDIR}
 	  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif()
@@ -91,10 +91,10 @@ SET(CPACK_PACKAGE_FILE_NAME          "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERS
 SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE    "http://qaul.net")
 
 # copy application icon
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/distfiles/linux/share/qaul_app_icon.png DESTINATION ${Qaul_ICONDIR})
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/distfiles/linux/share/qaul_app_icon.png DESTINATION ${QAUL_ICONDIR})
 
 # add qaul to applications menu 
-INSTALL(FILES ${PROJECT_BINARY_DIR}/distfiles/linux/share/qaul.desktop DESTINATION ${Qaul_DESKTOPDIR})
+INSTALL(FILES ${PROJECT_BINARY_DIR}/distfiles/linux/share/qaul.desktop DESTINATION ${QAUL_DESKTOPDIR})
 
 # All install must be done before this
 INCLUDE(CPack)
diff --git a/include/QaulConfig.h.in b/include/QaulConfig.h.in
@@ -1,13 +1,13 @@
 
 // the configured options and settings
 
-#define QAUL_VERSION_MAJOR @Qaul_VERSION_MAJOR@
-#define QAUL_VERSION_MINOR @Qaul_VERSION_MINOR@
-#define QAUL_VERSION_PATCH @Qaul_VERSION_PATCH@
-#define QAUL_VERSION_SUFFIX "@Qaul_VERSION_SUFFIX@"
-#define QAUL_VERSION "@Qaul_VERSION@"
+#define QAUL_VERSION_MAJOR @QAUL_VERSION_MAJOR@
+#define QAUL_VERSION_MINOR @QAUL_VERSION_MINOR@
+#define QAUL_VERSION_PATCH @QAUL_VERSION_PATCH@
+#define QAUL_VERSION_SUFFIX "@QAUL_VERSION_SUFFIX@"
+#define QAUL_VERSION "@QAUL_VERSION@"
 #define QAUL_ROOT_PATH "@CMAKE_INSTALL_PREFIX@"
-#define QAUL_DEFAULT_LOGLEVEL @Qaul_DEFAULT_LOGLEVEL@
+#define QAUL_DEFAULT_LOGLEVEL @QAUL_DEFAULT_LOGLEVEL@
 
 // what are we building for?