From 39df122449b0e2055f2e12e3ce38a0c010c7bd91 Mon Sep 17 00:00:00 2001 From: dzalkind Date: Mon, 13 Dec 2021 17:39:27 -0700 Subject: [PATCH] Revert windows cmake stuff to develop --- ROSCO/CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ROSCO/CMakeLists.txt b/ROSCO/CMakeLists.txt index 0b0d8746..07e6a8fe 100644 --- a/ROSCO/CMakeLists.txt +++ b/ROSCO/CMakeLists.txt @@ -39,13 +39,17 @@ if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU") elseif (APPLE OR UNIX OR CYGWIN) set(NWTC_SYS_FILE src/SysFiles/SysGnuLinux.f90) endif () -elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "^Intel") - if (APPLE OR UNIX) - set(NWTC_SYS_FILE src/SysFiles/SysIFL.f90) - elseif (WIN32) - set(NWTC_SYS_FILE src/SysFiles/SysIVF.f90) - endif (APPLE OR UNIX) -endif () +elseif (WIN32) + if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") + # Ensure static linking to avoid requiring Fortran runtime dependencies + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-0 -static-libgcc -static-libgfortran -static -fdefault-real-8 -fdefault-double-8 -cpp") + elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -libs:static -free -static -fpp -real-size:64 -double-size:64") +# set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /ffree-line-length-0 /static-libgcc /static-libgfortran /static /fdefault-real-8 /fdefault-double-8 /cpp") + endif() +endif() + + if (NWTC_SYS_FILE) message("-- Setting system file as: ${NWTC_SYS_FILE}")