From a8c46ebfb53c0e6dd2542b8bf62f350e3bf7ee00 Mon Sep 17 00:00:00 2001 From: Logan Drescher <106617880+CodeByDrescher@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:33:34 -0500 Subject: [PATCH] attempting to force MINGW build --- .github/workflows/cd.yml | 1 + CMakeLists.txt | 4 +--- smoldyn-2.38/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 20bcf952..dd40d08f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -87,6 +87,7 @@ jobs: -G Ninja \ -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \ -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \ + -DOPTION_MINGW=ON \ -DOPTION_TARGET_MESSAGING=OFF \ -DOPTION_TARGET_PARALLEL=OFF \ -DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \ diff --git a/CMakeLists.txt b/CMakeLists.txt index fb698fe6..e5a77d89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,9 +153,7 @@ set(WINDOWS FALSE) if (${CMAKE_SYSTEM_NAME} MATCHES Windows) set(WINDOWS TRUE) set(WIN32 TRUE) - if (${CMAKE_GENERATOR} MATCHES "Unix Makefiles") - set(MINGW TRUE) - endif (${CMAKE_GENERATOR} MATCHES "Unix Makefiles") + set(MINGW TRUE) endif() set (ARCH_64bit FALSE) diff --git a/smoldyn-2.38/CMakeLists.txt b/smoldyn-2.38/CMakeLists.txt index 853ff4f9..82f939cd 100644 --- a/smoldyn-2.38/CMakeLists.txt +++ b/smoldyn-2.38/CMakeLists.txt @@ -121,7 +121,7 @@ include_directories(source/lib source/Smoldyn source/NextSubVolume source/vtk ${ # The following command is to signal we need to link "szip", which hdf5 uses. We should look into # how to disable this, or at least control it via an option. -add_link_options("${CMAKE_LINK_LIBRARY_FLAG}sz") +# add_link_options("${CMAKE_LINK_LIBRARY_FLAG}sz") ####### Build for debugging or release ##########