diff --git a/CMakeLists.txt b/CMakeLists.txt index 25b41ff..2e003bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,17 +14,11 @@ include(DefineCMakeDefaults) # and -DCMAKE_BUILD_TYPE=AddressSanitizer include(DefineCompilerFlags) -project(cmocka C) +project(cmocka VERSION 1.1.2 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) -set(APPLICATION_VERSION_MAJOR "1") -set(APPLICATION_VERSION_MINOR "1") -set(APPLICATION_VERSION_PATCH "2") - -set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") - # SOVERSION scheme: CURRENT.AGE.REVISION # If there was an incompatible interface change: # Increment CURRENT. Set AGE and REVISION to 0 diff --git a/CPackConfig.cmake b/CPackConfig.cmake index a11f803..1af76c6 100644 --- a/CPackConfig.cmake +++ b/CPackConfig.cmake @@ -2,7 +2,7 @@ # http://www.cmake.org/Wiki/CMake:CPackConfiguration ### general settings -set(CPACK_PACKAGE_NAME ${APPLICATION_NAME}) +set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Unit testing framework for C with mock objects") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_VENDOR "Andreas Schneider") @@ -11,10 +11,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") ### versions -set(CPACK_PACKAGE_VERSION_MAJOR "${APPLICATION_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${APPLICATION_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${APPLICATION_VERSION_PATCH}") -set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) ### source generator @@ -37,7 +34,7 @@ endif (WIN32) set(CPACK_PACKAGE_INSTALL_DIRECTORY "cmocka") -set(CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION}) +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}) set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries") set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers") diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 9bdc6f8..3c2e414 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -7,8 +7,8 @@ include(CheckCXXSourceCompiles) include(CheckStructHasMember) include(TestBigEndian) -set(PACKAGE ${APPLICATION_NAME}) -set(VERSION ${APPLICATION_VERSION}) +set(PACKAGE ${PROJECT_NAME}) +set(VERSION ${PROJECT_VERSION}) set(DATADIR ${DATA_INSTALL_DIR}) set(LIBDIR ${LIB_INSTALL_DIR}) set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}") diff --git a/cmocka-config-version.cmake.in b/cmocka-config-version.cmake.in index 98f292c..4bff45e 100644 --- a/cmocka-config-version.cmake.in +++ b/cmocka-config-version.cmake.in @@ -1,4 +1,4 @@ -set(PACKAGE_VERSION @APPLICATION_VERSION@) +set(PACKAGE_VERSION @PROJECT_VERSION@) # Check whether the requested PACKAGE_FIND_VERSION is compatible if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") diff --git a/cmocka.pc.cmake b/cmocka.pc.cmake index c6f7433..5a302d3 100644 --- a/cmocka.pc.cmake +++ b/cmocka.pc.cmake @@ -1,6 +1,5 @@ -Name: ${APPLICATION_NAME} +Name: ${PROJECT_NAME} Description: The cmocka unit testing library -Version: ${APPLICATION_VERSION} +Version: ${PROJECT_VERSION} Libs: -L${LIB_INSTALL_DIR} -lcmocka Cflags: -I${INCLUDE_INSTALL_DIR} - diff --git a/config.h.cmake b/config.h.cmake index 1aaabb5..f8d79da 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,8 +1,8 @@ /* Name of package */ -#cmakedefine PACKAGE "${APPLICATION_NAME}" +#cmakedefine PACKAGE "${PROJECT_NAME}" /* Version number of package */ -#cmakedefine VERSION "${APPLICATION_VERSION}" +#cmakedefine VERSION "${PROJECT_VERSION}" #cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}" #cmakedefine DATADIR "${DATADIR}" diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 8c3426f..a7bc65e 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -6,8 +6,8 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.8.99") find_package(Doxygen) if (DOXYGEN_FOUND) - set(DOXYGEN_PROJECT_NAME ${APPLICATION_NAME}) - set(DOXYGEN_PROJECT_NUMBER ${APPLICATION_VERSION}) + set(DOXYGEN_PROJECT_NAME ${PROJECT_NAME}) + set(DOXYGEN_PROJECT_NUMBER ${PROJECT_VERSION}) set(DOXYGEN_PROJECT_BRIEF "Unit testing library with mock support") set(DOXYGEN_TAB_SIZE 4)