reordering configs, adding dependencies, fixing duplicate defines ecl…

…ipse-sumo#12 eclipse-sumo#3 eclipse-sumo#11115
rxd199682 · Jul 11, 2022 · c7f5a9c · c7f5a9c
1 parent 8909a89
commit c7f5a9c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -1,27 +1,27 @@
 {
   "configurations": [
     {
-      "name": "x64-Debug",
+      "name": "x64-Release",
       "generator": "Ninja",
-      "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "configurationType": "Release",
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v",
+      "buildCommandArgs": "",
       "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
       "variables": []
     },
     {
-      "name": "x64-Release",
+      "name": "x64-Debug",
       "generator": "Ninja",
-      "configurationType": "Release",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
       "variables": []
     }
   ]

diff --git a/src/libsumo/CMakeLists.txt b/src/libsumo/CMakeLists.txt
@@ -76,6 +76,7 @@ if (FOX_FOUND)
     set(sumo_link_libraries ${sumoguilibs})
 else ()
     add_library(libsumocpp SHARED ${libsumostatic_STAT_SRCS})
+    add_dependencies(libsumocpp generate-version-h install_dll)
     set(libsumo_link_library libsumostatic)
     set(sumo_link_libraries ${sumolibs})
 endif()
@@ -171,7 +172,6 @@ if(SWIG_FOUND)
         endif()
         if(PYTHONLIBS_FOUND)
             include_directories(${PYTHON_INCLUDE_PATH})
-            #                set(CMAKE_SWIG_FLAGS "")
             set(CMAKE_SWIG_FLAGS "-keyword") # is necessary for using keyword args
             # other options which should be evaluated: -builtin, -modern, -extranative
             set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -188,6 +188,7 @@ if(SWIG_FOUND)
             else()
                 SWIG_ADD_MODULE(libsumo python libsumo.i)
             endif()
+            add_dependencies(${SWIG_MODULE_libsumo_REAL_NAME} generate-version-h install_dll)
             if ((GNU_COMPILER OR CLANG_COMPILER) AND NOT APPLE)
                 swig_link_libraries(libsumo -Wl,--whole-archive ${libsumo_link_library} ${sumolibs} -Wl,--no-whole-archive)
             else()

diff --git a/src/utils/gui/globjects/GLIncludes.h b/src/utils/gui/globjects/GLIncludes.h
@@ -23,9 +23,13 @@
 #include <config.h>
 
 #ifdef WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
 #include <windows.h>
 #undef NOMINMAX
+#else
+#include <windows.h>
+#endif
 #endif
 
 #include <GL/gl.h>