From f6aebc53738429077553306f5a934252b57df07d Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Fri, 28 Feb 2020 09:00:38 +0100 Subject: [PATCH] Disable install targets with msvc --- external/abseil-cpp | 2 +- lv2/CMakeLists.txt | 4 +++- src/CMakeLists.txt | 28 +++++++++++++++++----------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/external/abseil-cpp b/external/abseil-cpp index 0f86336b..aa844899 160000 --- a/external/abseil-cpp +++ b/external/abseil-cpp @@ -1 +1 @@ -Subproject commit 0f86336b6939ea673cc1cbe29189286cae67d63a +Subproject commit aa844899c937bde5d2b24f276b59997e5b668bde diff --git a/lv2/CMakeLists.txt b/lv2/CMakeLists.txt index 2067fb17..aa732cb4 100644 --- a/lv2/CMakeLists.txt +++ b/lv2/CMakeLists.txt @@ -44,4 +44,6 @@ if (SFIZZ_USE_VCPKG OR SFIZZ_STATIC_LIBSNDFILE OR CMAKE_CXX_COMPILER_ID MATCHES endif() # Installation -install (DIRECTORY ${PROJECT_BINARY_DIR} DESTINATION ${LV2PLUGIN_INSTALL_DIR}) +if (NOT MSVC) + install (DIRECTORY ${PROJECT_BINARY_DIR} DESTINATION ${LV2PLUGIN_INSTALL_DIR}) +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e823c192..46215853 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,10 +34,12 @@ target_link_libraries (sfizz_static PUBLIC absl::strings absl::span) target_link_libraries (sfizz_static PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads sfizz-sndfile sfizz-pugixml) set_target_properties (sfizz_static PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER "sfizz.h;sfizz.hpp") -install (TARGETS sfizz_static - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +if (NOT MSVC) + install (TARGETS sfizz_static + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +endif() add_library (sfizz::parser ALIAS sfizz_parser) add_library (sfizz::sfizz ALIAS sfizz_static) @@ -61,11 +63,13 @@ if (SFIZZ_SHARED) sfizz_enable_lto_if_needed(sfizz_shared) configure_file (${PROJECT_SOURCE_DIR}/scripts/sfizz.pc.in sfizz.pc @ONLY) - install (TARGETS sfizz_shared - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + if (NOT MSVC) + install (TARGETS sfizz_shared + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() if (UNIX AND NOT APPLE) if (LIBATOMIC_FOUND) @@ -74,5 +78,7 @@ if (SFIZZ_SHARED) endif() endif() -install (FILES ${CMAKE_BINARY_DIR}/src/sfizz.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +if (NOT MSVC) + install (FILES ${CMAKE_BINARY_DIR}/src/sfizz.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +endif()