From 34cd505bf776284bdc39be1420b81f63c62f7a53 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 11 Sep 2016 23:10:29 +0200 Subject: [PATCH] Remove dependencies of install targets Dependencies were preventing installing static-only builds --- cmake/modules/BasicConfig.cmake | 2 +- cmake/modules/LibraryTarget.cmake | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index e70e45f..8efb27e 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -60,7 +60,7 @@ endif() # options for deciding whether to build static and/or shared libraries if(("${META_PROJECT_TYPE}" STREQUAL "library") OR ("${META_PROJECT_TYPE}" STREQUAL "")) - option(ENABLE_STATIC_LIBS "whether to building static libraries is enabled (disabled by default)" OFF) + option(ENABLE_STATIC_LIBS "whether building static libraries is enabled (disabled by default)" OFF) option(DISABLE_SHARED_LIBS "whether building dynamic libraries is disabled (enabled by default)" OFF) if(DISABLE_SHARED_LIBS) set(BUILD_SHARED_LIBS OFF) diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake index fea1f7e..10a1d3a 100644 --- a/cmake/modules/LibraryTarget.cmake +++ b/cmake/modules/LibraryTarget.cmake @@ -146,7 +146,6 @@ install( ) if(NOT TARGET install-cmake-config) add_custom_target(install-cmake-config - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=cmake-config -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif() @@ -159,7 +158,6 @@ install( ) if(NOT TARGET install-pkg-config) add_custom_target(install-pkg-config - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=pkg-config -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif() @@ -178,7 +176,6 @@ if(BUILD_SHARED_LIBS) endif() if(NOT TARGET install-binary) add_custom_target(install-binary - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif() @@ -199,7 +196,6 @@ endif() # add install target for stripped libs if(NOT TARGET install-binary-strip) add_custom_target(install-binary-strip - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif() @@ -215,7 +211,6 @@ foreach(HEADER_FILE ${HEADER_FILES} ${ADDITIONAL_HEADER_FILES}) endforeach() if(NOT TARGET install-header) add_custom_target(install-header - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=header -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif() @@ -231,7 +226,6 @@ foreach(CMAKE_MODULE_FILE ${CMAKE_MODULE_FILES}) endforeach() if(NOT TARGET install-cmake-modules) add_custom_target(install-cmake-modules - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=cmake-modules -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif() @@ -247,7 +241,6 @@ foreach(CMAKE_TEMPLATE_FILE ${CMAKE_TEMPLATE_FILES}) endforeach() if(NOT TARGET install-cmake-templates) add_custom_target(install-cmake-templates - DEPENDS ${META_PROJECT_NAME} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=cmake-templates -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) endif()