From 7da845a12d0fb9be7c1d8a6f393970ef354c663f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 1 Mar 2017 13:08:59 +0100 Subject: cmake cleanup and set the version in project() --- common/CMakeLists.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'common') diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index f6a8823..34e48c6 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,28 +1,27 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(domain) -project(sink) - -ecm_setup_version("${SINK_VERSION}" VARIABLE_PREFIX Sink - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sink_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake" - SOVERSION 0 +ecm_setup_version(${sink_VERSION} + VARIABLE_PREFIX Sink + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sink_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake" + SOVERSION 0 ) ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Sink") -ecm_configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/SinkConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/SinkConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel + "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel ) add_definitions("-fvisibility=hidden") -- cgit v1.2.3