]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix configuring with static libraries 14932/head
authorDaniel Arndt <arndtd@ornl.gov>
Tue, 21 Mar 2023 17:16:43 +0000 (13:16 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Tue, 21 Mar 2023 17:16:43 +0000 (13:16 -0400)
source/CMakeLists.txt

index 25214e6817d6d5f01ffbf44115d95ec86991edd4..ca59fe2abef92f59d6434628fda2feba1e21a62a 100644 (file)
@@ -83,7 +83,7 @@ foreach(build ${DEAL_II_BUILD_TYPES})
   #
 
   set(_object_files "")
-  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+  if(NOT BUILD_SHARED_LIBS)
     get_property(_object_targets GLOBAL PROPERTY DEAL_II_OBJECT_TARGETS_${build})
     foreach(_target ${_object_targets})
       list(APPEND _object_files "$<TARGET_OBJECTS:${_target}>")
@@ -99,7 +99,7 @@ foreach(build ${DEAL_II_BUILD_TYPES})
   #
   populate_target_properties(${DEAL_II_NAMESPACE}_${build_lowercase} ${build})
 
-  if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+  if(BUILD_SHARED_LIBS)
     #
     # Add all object targets as private link targets
     #

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.