From 71069377d3bf1be1078a1ccb8e7bcc0c13a17415 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 4 Mar 2013 09:06:32 +0000 Subject: [PATCH] A small modification to install also the dll part when building shared libraries on Windows and Cygwin git-svn-id: https://svn.dealii.org/branches/branch_cmake@28718 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/checks/check_01_system_features.cmake | 8 +++----- deal.II/source/CMakeLists.txt | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/deal.II/cmake/checks/check_01_system_features.cmake b/deal.II/cmake/checks/check_01_system_features.cmake index 5cd66cd4a6..ac792086aa 100644 --- a/deal.II/cmake/checks/check_01_system_features.cmake +++ b/deal.II/cmake/checks/check_01_system_features.cmake @@ -95,13 +95,11 @@ ENDIF() # -# Disable shared libraries on CYGWIN and Windows targets for the moment. -# Our support for shared libraries on Windows is a bit buggy atm.. +# Disable shared libraries on native Windows targets for the moment. # -# - Matthias Maier, 2012 +# - Matthias Maier, 2013 # -IF( CMAKE_SYSTEM_NAME MATCHES "CYGWIN" OR - CMAKE_SYSTEM_NAME MATCHES "Windows" ) +IF(CMAKE_SYSTEM_NAME MATCHES "Windows") MESSAGE(WARNING "\n" "BUILD_SHARED_LIBS forced to OFF\n\n" ) diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt index 9481c29d09..5cf01b03de 100644 --- a/deal.II/source/CMakeLists.txt +++ b/deal.II/source/CMakeLists.txt @@ -75,8 +75,7 @@ FOREACH(build ${DEAL_II_BUILD_TYPES}) INSTALL(TARGETS ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} EXPORT ${DEAL_II_PROJECT_CONFIG_NAME}Targets - ARCHIVE DESTINATION ${DEAL_II_LIBRARY_RELDIR} - LIBRARY DESTINATION ${DEAL_II_LIBRARY_RELDIR} + DESTINATION ${DEAL_II_LIBRARY_RELDIR} COMPONENT library ) -- 2.39.5