Skip to content

Develop to main for SAM 2026.7.3 #62

Merged
brtietz merged 12 commits into
mainfrom
develop
Jul 7, 2026
Merged

Develop to main for SAM 2026.7.3 #62
brtietz merged 12 commits into
mainfrom
develop

Conversation

@brtietz

@brtietz brtietz commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator

Merge tagged version to main

Brian Mirletz and others added 12 commits December 5, 2025 11:49
* testing using release versions of wxWidgets

* Working on release versions for wxWidgets libraries

* lk_sandbox generated and working with release wxWidgets libraries

* wxWidgets mapping for ORTools build handled in top level CMakeLists.txt for Windows

* wxWidgets in top level - all but export_config building on Windows

* Update for failing Windows wex runner

* MSVC updates for failing wex Windows runner when building lk

* clean up CMakeLists for Windows build for wex runner

* Fix broken lk_sandbox debug version build on Windows

* Fix issue with wex GA Windows runner

* Updates for Windows debug build for GA runners

* Update all c++ cmake commands to be consistent with ortools v9.14

if(MSVC)
  set(CMAKE_CXX_STANDARD 20)
else()
  set(CMAKE_CXX_STANDARD 17)
endif()

* All CMakeLists.txt set(CMAKE_CXX_STANDARD 20) per 2/28/2026 meeting

---------

Co-authored-by: Brian Mirletz <brian.mirletz@nrel.gov>
Fix debug build for Windows and ortools per email 3/16/2026
Update address of license to NatLabRockies
@brtietz brtietz merged commit b6ff349 into main Jul 7, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants