more static deactivation

virtualcell · Jan 25, 2024 · afff0cc · afff0cc
1 parent 87d84e0
commit afff0cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -238,6 +238,9 @@ if (${OPTION_TARGET_MOVINGBOUNDARY_SOLVER} OR
 		add_subdirectory(hdf5-1.8.11)
 	else()
 		set(HDF5_USE_STATIC_LIBRARIES ON)
+		if(WINDOWS OR WIN32 OR WIN64)
+			set(HDF5_USE_STATIC_LIBRARIES OFF)
+		endif ()
 		#CMakeList.txt that comes with hdf5 switches library name if compiled with debug
 		find_package(HDF5 COMPONENTS HL CXX C)
 		set(HDF_VERSION ${HDF5_VERSION})

diff --git a/smoldyn-2.38/CMakeLists.txt b/smoldyn-2.38/CMakeLists.txt
@@ -171,8 +171,6 @@ elseif (OPTION_MINGW)
 #	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
 #	set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static -s")
 # 	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -static -s")
-	set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -s")
-	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}-s")
 endif()
 
 set(APPLE_BUILD 0)