A small modification to install also the dll part when building shared libraries...

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28718 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/checks/check_01_system_features.cmake b/deal.II/cmake/checks/check_01_system_features.cmake
index 5cd66cd4a6800ffae14c6a3991638f2d763bd4d7..ac792086aa403c18e5f77998e86aa58af3a461a5 100644 (file)
--- 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 9481c29d0972add43853fcdd87b0153d3aa5f6e2..5cf01b03de04c5c9c11eaa5c757422ad781964e4 100644 (file)
--- 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
     )