Merge branch 'develop' of https://github.com/NREL/ssc into rmrflandbosse

Author: brtietz

.github/workflows/release.yml

@@ -46,4 +46,4 @@ jobs:
         git add '${{ github.workspace }}/ssc/test/elapsed_time_release'
         git commit -m "Update Test Elapsed Time CSVs for new Release"
         git push origin update_test_times
-        gh pr create -B develop -H update_test_times --title 'Merge update_test_times into develop' --body 'Created by Github action'
+        gh pr create -B develop -H update_test_times --title 'Merge update_test_times into develop' --body 'As part of automated release process, run the SSC tests and update the test times CSV. This allows tracking of the test times across releases, and for comparison of feature branchs' test times to that of the latest release.\n\nCreated via release.yml by Github action'

CMakeLists.txt

@@ -50,6 +50,15 @@ endif()
 
 Project(sam_simulation_core VERSION 1.0.0 LANGUAGES CXX C)
 
+if(MSVC)
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Debug and Release Builds Configured" FORCE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20")
+    # for linking to Release build of ortools 
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
+    # Get the current debug flags and remove the /D_DEBUG option.
+    string(REPLACE "/D_DEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+ endif()
+
 
 #####################################################################################################################
 #

sdktool/CMakeLists.txt

@@ -24,11 +24,52 @@ if (UNIX)
 	set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
 	find_package(wxWidgets QUIET  COMPONENTS qa aui richtext html propgrid adv net stc core xml base REQUIRED)
 else()
-	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-	find_package(wxWidgets  QUIET COMPONENTS qa webview aui richtext html propgrid adv net stc core xml base scintilla REQUIRED)
+#	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+#	find_package(wxWidgets  QUIET COMPONENTS qa webview aui richtext html propgrid adv net stc core xml base scintilla REQUIRED)
+
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Debug and Release Builds Configured" FORCE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20")
+    # for linking to Release build of ortools 
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
+    # Get the current debug flags and remove the /D_DEBUG option.
+    string(REPLACE "/D_DEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    # following does not force release libraries for wxWidgets using find_package
+    #set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG RELEASE)
+
+    set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+    find_package(wxWidgets QUIET  REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+
+ #   message("All wxWidgets: " ${wxWidgets_LIBRARIES})
+    set(FOUND "false")
+    foreach(lib ${wxWidgets_LIBRARIES})
+        string(FIND ${lib} "optimized" INDEX)
+        string(FIND ${lib} "debug" INDEX2)
+        string(FIND ${lib} "wxWidgets" INDEX3)
+        if (INDEX GREATER_EQUAL 0) # skip once
+            set(FOUND "true")
+            continue()
+        elseif((INDEX2 LESS 0) AND (INDEX3 LESS 0))
+            set(FOUND "true")
+        endif()
+        if (${FOUND} STREQUAL "true")
+            set(FOUND "false")
+            message("lib: ${lib}")
+            list(APPEND WX_LIBS_LIST ${lib})
+        endif()
+    endforeach()
+
+    list(JOIN WX_LIBS_LIST ";" wxWidgets_LIBRARIES)
+#    message("Link Libraries for wxWidgets: ${wxWidgets_LIBRARIES}")
+
+
 endif()
 
-include(${wxWidgets_USE_FILE})
+if (wxWidgets_FOUND)
+    include(${wxWidgets_USE_FILE})
+endif ()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
+
+
 
 
 #####################################################################################################################

test/CMakeLists.txt

@@ -78,7 +78,8 @@ endif()
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST CMAKE_CONFIGURATION_TYPES)
     find_library( GTESTD_LIB
         NAMES libgtest.a gtest.lib libgtest.so
-        PATHS $ENV{GTEST_DIR} ${GTDIR}/build/lib ${GTDIR}/build/lib/Debug)
+        # ortools release libraries only
+        PATHS $ENV{GTEST_DIR} ${GTDIR}/build/lib ${GTDIR}/build/lib/Release)
     if(UNIX AND ENABLE_COVERAGE)
         target_link_options(Test PRIVATE --coverage)
         target_link_libraries(Test debug gcov ${GTESTD_LIB})