Skip to content

Commit 574f6fa

Browse files
authored
Merge pull request #181 from NREL/develop
Develop to main for 2024.12.12
2 parents 8c1ebd3 + 824c11c commit 574f6fa

20 files changed

+410
-7727
lines changed

.github/workflows/ci.yml

+322-38
Large diffs are not rendered by default.

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ option(SAM_SKIP_TOOLS "Skips the wex sandbox and Dview builds" OFF)
1414
#
1515

1616
if (APPLE)
17-
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
17+
set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
1818
endif ()
1919

2020
if (UNIX AND NOT CMAKE_C_COMPILER)

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# WEX: Extensions Library for wxWidgets
2-
[![TravisCI](https://travis-ci.org/NREL/wex.svg?branch=develop)](https://travis-ci.org/NREL/wex)
3-
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FNREL%2Fwex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FNREL%2Fwex?ref=badge_shield)
42

5-
WEX is a library of extensions to the [wxWidgets](https://www.wxwidgets.org/) cross-platform user interface (UI) library. These extensions are for custom UI widgets developed for the National Renewable Energy Laboratory's [System Advisor Model (SAM)](https://sam.nrel.gov) and [DView](https://github.com/NREL/wex/wiki/DView) data visualization software.
3+
WEX is a library of extensions to the [wxWidgets](https://www.wxwidgets.org/) cross-platform user interface (UI) library. These extensions are for custom UI widgets developed for the National Renewable Energy Laboratory's [System Advisor Model (SAM)](https://sam.nrel.gov) and [DView](https://github.com/NREL/wex/wiki/DView) data visualization software.
64

75
WEX also includes two executable programs:
86

include/wex/json_defs.h

-215
This file was deleted.

0 commit comments

Comments
 (0)