Skip to content

OR Tools #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qualand merged 16 commits into from
Mar 13, 2026
Merged

OR Tools #58

Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9149018
Merge pull request #56 from NREL/develop
Apr 21, 2025
235d6a2
testing using release versions of wxWidgets
sjanzou Sep 4, 2025
23298ee
Working on release versions for wxWidgets libraries
sjanzou Sep 10, 2025
bab4201
lk_sandbox generated and working with release wxWidgets libraries
sjanzou Sep 10, 2025
7e943dc
wxWidgets mapping for ORTools build handled in top level CMakeLists.t…
sjanzou Sep 11, 2025
2666905
wxWidgets in top level - all but export_config building on Windows
sjanzou Sep 11, 2025
1c3e88d
Merge branch 'develop' into ortools_build
sjanzou Jan 4, 2026
91cc2f0
Update for failing Windows wex runner
sjanzou Jan 4, 2026
75189c3
MSVC updates for failing wex Windows runner when building lk
sjanzou Jan 4, 2026
b19b6ca
clean up CMakeLists for Windows build for wex runner
sjanzou Jan 4, 2026
4889344
Fix broken lk_sandbox debug version build on Windows
sjanzou Feb 4, 2026
7f2ead4
Fix issue with wex GA Windows runner
sjanzou Feb 4, 2026
00de8e1
Updates for Windows debug build for GA runners
sjanzou Feb 5, 2026
a045da5
Update all c++ cmake commands to be consistent with ortools v9.14
sjanzou Feb 16, 2026
3ce9838
Merge remote-tracking branch 'origin/develop' into ortools_build
sjanzou Feb 19, 2026
f41ee17
All CMakeLists.txt set(CMAKE_CXX_STANDARD 20) per 2/28/2026 meeting
sjanzou Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ set(LK_SRC
#
#####################################################################################################################

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)

if (MSVC)
add_compile_options(/W3 /wd4996 /MP)
Expand All @@ -57,7 +57,7 @@ if (MSVC)
set(${flag_var} "${${flag_var}} /D_DEBUG" CACHE STRING "compile flags" FORCE)
endforeach ()
else (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
if (APPLE)
add_compile_options( -fno-common)
Expand All @@ -82,17 +82,19 @@ endif (MSVC)
if (UNIX)
if(EXISTS /usr/local/bin/wx-config-3)
set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
else ()
set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config)
find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
endif ()
else ()
set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla)
find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
endif ()

include(${wxWidgets_USE_FILE})
if (wxWidgets_FOUND)
include(${wxWidgets_USE_FILE})
endif ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")


Expand Down Expand Up @@ -151,5 +153,6 @@ if (NOT SAM_SKIP_TOOLS)
target_link_libraries(lk_sandbox -ldl)
endif ()

target_link_libraries(lk_sandbox lk ${wxWidgets_LIBRARIES})
target_link_libraries(lk_sandbox ${wxWidgets_LIBRARIES})

endif()