Merge pull request #369 from karosc/develop

pyswmm · Apr 13, 2022 · aae89b3 · aae89b3
2 parents 025337c + 1e556b2
commit aae89b3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -20,15 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016, ubuntu-16.04, macos-10.15]
+        os: [windows-2022, ubuntu-20.04, macos-10.15]
         requirements: [requirements-swmm.txt]
         include:
-          - os: windows-2016
+          - os: windows-2022
             sys_pkgs: choco install boost-msvc-14.1
-            build_unit_test: make.cmd -t -g "Visual Studio 15 2017 Win64"
-            build_reg_test:  make.cmd -g "Visual Studio 15 2017 Win64"
+            build_unit_test: make.cmd /g "Visual Studio 17 2022" /A "x64" /t
+            build_reg_test: make.cmd /g "Visual Studio 17 2022" /A "x64"
             before_reg_test: before-nrtest.cmd
-            run_reg_test:    run-nrtests.cmd
+            run_reg_test: run-nrtests.cmd
             build_id: "%GITHUB_RUN_ID%_%GITHUB_RUN_NUMBER%"
             experimental: false
             artifacts_ext: zip
@@ -38,12 +38,13 @@ jobs:
                 shell: cmd
                 working-directory: ./ci-tools/windows
 
-          - os: ubuntu-16.04
+          - os: ubuntu-20.04
             sys_pkgs: sudo apt install libboost-dev libboost-all-dev
-            build_unit_test: make.sh -t -g "Unix Makefiles"
-            build_reg_test:  make.sh -g "Unix Makefiles"
+            # Statically link libraries with -s switch to address GitHub Ubuntu 20.04 symbol errors (issue #340)
+            build_unit_test: make.sh -s -t -g "Unix Makefiles"
+            build_reg_test: make.sh -s -g "Unix Makefiles"
             before_reg_test: before-nrtest.sh
-            run_reg_test:    run-nrtests.sh
+            run_reg_test: run-nrtests.sh
             build_id: ${GITHUB_RUN_ID}_${GITHUB_RUN_NUMBER}
             experimental: true
             artifacts_ext: tar.gz
@@ -56,9 +57,9 @@ jobs:
           - os: macos-10.15
             sys_pkgs: brew install libomp boost
             build_unit_test: make.zsh -t -g "Xcode"
-            build_reg_test:  make.zsh -g "Xcode"
+            build_reg_test: make.zsh -g "Xcode"
             before_reg_test: before-nrtest.zsh
-            run_reg_test:    run-nrtests.zsh
+            run_reg_test: run-nrtests.zsh
             build_id: ${GITHUB_RUN_ID}_${GITHUB_RUN_NUMBER}
             experimental: true
             artifacts_ext: tar.gz
@@ -80,7 +81,6 @@ jobs:
       BUILD_HOME: build
       TEST_HOME: nrtests
 
-
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -114,7 +114,7 @@ jobs:
       - name: Before reg test
         env:
           NRTESTS_URL: https://github.com/OpenWaterAnalytics/swmm-nrtestsuite
-          BENCHMARK_TAG: v1.0.4-dev
+          BENCHMARK_TAG: v2.0.1
         run: ./${{ matrix.before_reg_test }} ${{ env.BENCHMARK_TAG }}
 
       - name: Run reg test

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,6 +49,8 @@ set(CONFIG_DIST  "cmake")
 option(BUILD_TESTS "Build component tests (requires Boost)" OFF)
 option(BUILD_DOCS "Build toolkit docs (requires Doxygen)" OFF)
 
+# Added option to statically link libraries to address GitHub Ubuntu 20.04 symbol errors (issue #340)
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
 # Add project subdirectories
 if(BUILD_DOCS)

diff --git a/src/outfile/CMakeLists.txt b/src/outfile/CMakeLists.txt
@@ -18,8 +18,7 @@ set(SWMM_OUT_PUBLIC_HEADERS
 
 
 # the binary output file API
-add_library(swmm-output
-    SHARED
+add_library(swmm-output    
         swmm_output.c
         errormanager.c
 )

diff --git a/src/solver/CMakeLists.txt b/src/solver/CMakeLists.txt
@@ -38,17 +38,15 @@ if(BUILD_DEF)
         PROPERTIES_HEADER_FILE_ONLY TRUE
     )
 
-    add_library(swmm5
-        SHARED
+    add_library(swmm5        
             ${SWMM_SOURCES}
             ${PROJECT_SOURCE_DIR/bindings/swmm5.def}
             $<TARGET_OBJECTS:shared_objs>
     )
 
 else()
     # Performs standard library build
-    add_library(swmm5
-        SHARED
+    add_library(swmm5        
             ${SWMM_SOURCES}
             $<TARGET_OBJECTS:shared_objs>
     )