Update windows cmake preset (#822)

Disable LGPL-only and remove unnecessary options.
atmtools · Sep 18, 2024 · 06398f2 · 06398f2
2 parents 70485db + bb20abc
commit 06398f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/3rdparty/cdisort/CMakeLists.txt b/3rdparty/cdisort/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT ENABLE_ARTS_LGPL)
+if(NOT ENABLE_ARTS_LGPL AND NOT CMAKE_CXX_COMPILER_ID MATCHES MSVC)
 add_library (cdisort STATIC
   cdisort.cc
   locate.c
@@ -12,6 +12,7 @@ add_executable(disotest
   target_link_libraries(disotest m)
 
   set(CDISORT_COMPILE_FLAGS "-Wno-all -Wno-unused-parameter -Wno-conversion -Wno-shadow -Wno-float-conversion")
+
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       set(CDISORT_COMPILE_FLAGS "${CDISORT_COMPILE_FLAGS} -Wno-format-overflow")
   endif()

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -51,11 +51,7 @@
         "CMAKE_C_COMPILER": "cl.exe",
         "CMAKE_CXX_COMPILER": "cl.exe",
         "ENABLE_FORTRAN": "0",
-        "ENABLE_ARTS_LGPL": "1",
-        "NO_FASTEM": "1",
-        "NO_OPENMP": "1",
-        "NO_RT4": "1",
-        "NO_TMATRIX": "1"
+        "NO_OPENMP": "1"
       },
       "environment": {
         "CPPFLAGS": "$env{CFLAGS}",

diff --git a/src/core/disort-cpp/CMakeLists.txt b/src/core/disort-cpp/CMakeLists.txt
@@ -44,7 +44,7 @@ add_dependencies(check-deps disort-cpp-test-9)
 add_dependencies(check-deps disort-cpp-test-11)
 add_dependencies(check-deps disort-test-clearsky-multilayer)
 
-if (NOT ENABLE_ARTS_LGPL)
+if (NOT ENABLE_ARTS_LGPL AND NOT CMAKE_CXX_COMPILER_ID MATCHES MSVC)
   add_executable(test-old-impl test-old-impl.cpp)
   target_link_libraries(test-old-impl disort-cpp artstime cdisort)
 endif ()