From 8a6b267febc287b17a498289ee0079de233186ef Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Sat, 12 May 2012 22:17:06 +0200 Subject: remove LIBRARY_TYPE cmake variable As discussed, remove the LIBRARY_TYPE cmake variable and put BUILD_SHARED_LIBS instead into the cache, set to TRUE. So if somebody wants to build a static library, and the project allows it (by not explicitely using "STATIC" in add_library()), he can switch this variable to FALSE in the cache. Also, put the ARCHIVE library component into the Devel install component, static libs and Windows lib files belong to the development package. Use newer write_basic_package_version_file() instead of older write_basic_config_version_file(), which are identical beside the name Alex --- modules/ECMQtFramework.cmake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'modules/ECMQtFramework.cmake') diff --git a/modules/ECMQtFramework.cmake b/modules/ECMQtFramework.cmake index fdbb6de9..ef31e03e 100644 --- a/modules/ECMQtFramework.cmake +++ b/modules/ECMQtFramework.cmake @@ -89,13 +89,11 @@ include(FeatureSummary) -set(LIBRARY_TYPE SHARED) - set(ECM_TARGET_DEFAULT_ARGS # EXPORT ${PROJECT_NAME}LibraryTargets RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT ${PROJECT_NAME} LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT ${PROJECT_NAME} - ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT ${PROJECT_NAME} + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel ) set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/${PROJECT_NAME}") @@ -109,9 +107,7 @@ configure_package_config_file( PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR CMAKE_INSTALL_PREFIX ) -include(WriteBasicConfigVersionFile) - -write_basic_config_version_file("${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" +write_basic_package_version_file("${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" VERSION ${ECM_VERSION_MAJOR}.${ECM_VERSION_MINOR}.${ECM_VERSION_PATCH} COMPATIBILITY AnyNewerVersion ) -- cgit v1.2.1