Merge pull request #629 from t-b/FixCMakeBuildTypeInconsistencies

[Backport to 9.3-backports] Fix CMAKE_BUILD_TYPE inconsistencies

Author: t-b

configure/CMakeLists.txt

@@ -3,8 +3,8 @@ include(FindDoxygen)
 include(GNUInstallDirs)
 
 if(NOT CMAKE_BUILD_TYPE)
-    message("No build type specified - default is RELEASE")
-    set(CMAKE_BUILD_TYPE RELEASE)
+    message("No build type specified - default is Release")
+    set(CMAKE_BUILD_TYPE Release)
 endif()
 
 if(NOT TANGO_DEVICE_SERVER_PATH)
@@ -201,7 +201,7 @@ if(NOT WIN32)
     #setup for GNU CXX compiler
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         message("found GNU compiler ...")
-        if(CMAKE_BUILD_TYPE MATCHES RELEASE)
+        if(CMAKE_BUILD_TYPE STREQUAL "Release")
             message("setup for release build ...")
             add_definitions(-D_FORTIFY_SOURCE=2)
         else()

configure/cpack_linux.cmake

@@ -3,15 +3,15 @@ execute_process(COMMAND ${DPKG_CMD} --print-architecture
         OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 set(CPACK_GENERATOR "DEB")
-if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CPACK_PACKAGE_NAME libtango9lts-dbg)
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcos4-dev, libzmq5-dev | libzmq3-dev")
     set(CPACK_DEBIAN_PACKAGE_CONFLICTS "libtango7-dev, libtango8-dev, libtango9-dev, libtango-dev, liblog4tango-dev, libtango9lts-dev")
-elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE")
+elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
     set(CPACK_PACKAGE_NAME libtango9lts-dev)
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcos4-1, libzmq5 | libzmq3")
     set(CPACK_DEBIAN_PACKAGE_CONFLICTS "libtango7-dev, libtango8-dev, libtango9-dev, libtango-dev, liblog4tango-dev, libtango9lts-dbg")
-endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 set(CPACK_PACKAGE_VERSION "${LIBRARY_VERSION}")
 set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})