Merge pull request #177 from NREL/patch_to_develop_240825

Patch to develop 240825

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ env:
   WX_VERSION: '3.2.4'
   DEFAULT_BRANCH: develop
 
+
 jobs:
   build-on-ubuntu:
     runs-on: ubuntu-latest
@@ -25,7 +26,7 @@ jobs:
         path: wex
 
     - name: Set relative paths
-      run: | 
+      run: |
         WXMSW3=$HOME/wx-$WX_VERSION
         echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
 
@@ -89,9 +90,6 @@ jobs:
         git ls-remote --heads --exit-code https://github.com/NREL/ssc.git $GIT_BRANCH
         if [[ $? != "0" ]]; then echo "SSC_BRANCH=$DEFAULT_BRANCH" >> $GITHUB_ENV; else echo "SSC_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV; fi
 
-    - name: Get git ref of sibling dependency LK
-      shell: bash {0}
-      run: |
         ref=$(git ls-remote --exit-code https://github.com/NREL/lk.git refs/heads/${LK_BRANCH} | awk '{print $1}')
         echo "ref_of_lk=$ref" | tee --append $GITHUB_ENV
         
@@ -164,7 +162,7 @@ jobs:
         path: wex
     - name: Set relative paths
       shell: bash
-      run: | 
+      run: |
         WXMSW3=$GITHUB_WORKSPACE/wx-$WX_VERSION
         echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
     - name: Setup cmake
@@ -243,6 +241,11 @@ jobs:
         echo "LKD_LIB=$GITHUB_WORKSPACE/lk/build/Debug" >>$GITHUB_ENV
         echo "LK_LIB=$GITHUB_WORKSPACE/lk/build/Release" >>$GITHUB_ENV
         echo "RAPIDJSONDIR=$GITHUB_WORKSPACE/ssc" >>$GITHUB_ENV
+    - name: Get git ref of sibling dependency SSC
+      shell: bash
+      run: |
+        ref=$(git ls-remote --exit-code https://github.com/NREL/ssc.git refs/heads/patch | awk '{print $1}')
+        echo "ref_of_ssc=$ref" | tee --append $GITHUB_ENV
     - name: Get cached build data of sibling dependency SSC
       uses: actions/cache@v4
       id: cachedssc
@@ -281,7 +284,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
     steps:
       - name: Set relative paths
-        run: | 
+        run: |
           WXMSW3=$HOME/wx-$WX_VERSION
           echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
       - name: Checkout
@@ -300,7 +303,7 @@ jobs:
           curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VERSION/wxWidgets-$WX_VERSION.tar.bz2 -o wxWidgets-$WX_VERSION.tar.bz2
           tar jxf wxWidgets-$WX_VERSION.tar.bz2
           cd wxWidgets-$WX_VERSION
-          ./configure --prefix=$HOME/wx-$WX_VERSION --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15  --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin
+          ./configure --prefix=$HOME/wx-$WX_VERSION --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=12  --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin
           make -j3
           make install
           sudo ln -s $HOME/wx-$WX_VERSION/bin/wx-config /usr/local/bin/wx-config-3

CMakeLists.txt

@@ -14,7 +14,7 @@ option(SAM_SKIP_TOOLS "Skips the wex sandbox and Dview builds" OFF)
 #
 
 if (APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
 endif ()
 
 if (UNIX AND NOT CMAKE_C_COMPILER)

README.md

@@ -2,7 +2,7 @@
 [![TravisCI](https://travis-ci.org/NREL/wex.svg?branch=develop)](https://travis-ci.org/NREL/wex)
 [![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)
 
-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.
+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.
 
 WEX also includes two executable programs: