Merge pull request mdaus#795 from holmesv3/develop/version2

Develop/version2

Author: holmesv3

.github/workflows/build_unittest.yml

@@ -6,142 +6,67 @@ on:
     branches:
       - main
 
-
 jobs:
   build-cmake-windows:
     strategy:
       matrix:
         os: [windows-latest]
-        python-version: ['3.7']
-    name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
+        configuration: [Debug, Release]
+    name: ${{ matrix.os }}-${{ matrix.configuration }}-CMake
     runs-on: ${{ matrix.os }}
     steps:
     - name: Skip Duplicate Actions
       uses: fkirc/skip-duplicate-actions@v5.3.1
     - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
-    - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install python dependencies
-      run: |
-        pip install numpy
     - name: configure
       run: |
         ls env:
-        mkdir target-Release
-        cd target-Release
-        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=${{ matrix.python-version }} -DENABLE_SWIG=ON
-        cd ..
-        mkdir target-Debug
-        cd target-Debug
-        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DENABLE_PYTHON=OFF
+        mkdir target && cd target
+        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github
     - name: build
       run: |
-        cd target-Release
-        cmake --build . --config Release -j
-        cd ..
-        cd target-Debug
-        cmake --build . --config Debug -j
+        cmake --build target --config ${{ matrix.configuration }} -j 
     - name: test # should run w/o install
       run: |
-        cd target-Release
-        ctest -C Release --output-on-failure
-        cd ..
-        cd target-Debug
-        ctest -C Debug --output-on-failure
+        ctest --test-dir target -C ${{ matrix.configuration }} --output-on-failure
     - name: install
       run: |
-        cd target-Release
-        cmake --build . --config Release --target install
-        cd ..
-        cd target-Debug
-        cmake --build . --config Debug --target install
-        cd ..
-
-  build-msbuild-windows:
-    strategy:
-      matrix:
-        os: [windows-latest]
-        platform: [x64]
-        configuration: [Debug] # Debug turns on more compiler warnings
-        avx: [AVX512F]
-    name: ${{ matrix.os }}-${{ matrix.avx }}-msbuild
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - name: Skip Duplicate Actions
-      uses: fkirc/skip-duplicate-actions@v5.3.1
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
-    - name: configure
-      run: |
-        ls env:
-        mkdir out
-        cd out
-        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF -DENABLE_${{ matrix.avx }}=ON
-    - name: build
-      run: |
-        cd out
-        cmake --build . --config ${{ matrix.configuration }} -j
-        cmake --build . --config ${{ matrix.configuration }} --target install
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
-      with:
-        msbuild-architecture: x64
-    - name: msbuild
-      run: |
-        msbuild coda-oss.sln /p:configuration=${{ matrix.configuration }}
-    # Can't figure out how to make this work :-(
-    #- name: vstest 
-    #  uses: microsoft/vstest-action@v1.0.0 # https://github.com/marketplace/actions/vstest-action
-    #  with:
-    #      testAssembly: UnitTest.dll
-    #      searchFolder: D:\a\nitro\nitro\${{ matrix.platform }}\${{ matrix.configuration }}
-    #      runInParallel: true  
+        cmake --install target --config ${{ matrix.configuration }}
 
   build-linux-cmake-default:
     strategy:
       matrix:
-        os: [ubuntu-22.04]
-        python-version: ['3.7']
-    name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
+        os: [ubuntu-24.04]
+    name: ${{ matrix.os }}-CMake
     runs-on: ${{ matrix.os }}
     steps:
     - name: Skip Duplicate Actions
       uses: fkirc/skip-duplicate-actions@v5.3.1
     - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
-    - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
+    - name: Setup Cpp
+      uses: aminya/setup-cpp@v1 # https://github.com/marketplace/actions/setup-cpp-c-c
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install python dependencies
-      run: |
-        pip install numpy
+          compiler: gcc-14
     - name: configure
       run: |
         env
-        which python
         mkdir target && cd target
-        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=${{ matrix.python-version }} -DENABLE_SWIG=ON
+        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github
     - name: build
       run: |
-        cd target
-        # "-j" spawns too many processes causing GCC to crash
-        cmake --build . -j 12
+        cmake --build target -j
     - name: test
     # should run w/o install
       run: |
-        cd target
-        ctest --output-on-failure
+        ctest --test-dir target --output-on-failure
     - name: install
       run: |
-        cd target
-        cmake --build . --target install
+        cmake --install target 
 
   build-linux-cmake:
     strategy:
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         configuration: [Debug, Release]
         avx: [AVX512F]
     name: ${{ matrix.os }}-${{ matrix.configuration }}-${{ matrix.avx }}-CMake
@@ -150,58 +75,17 @@ jobs:
     - name: Skip Duplicate Actions
       uses: fkirc/skip-duplicate-actions@v5.3.1
     - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
-    - name: configure
-      run: |
-        mkdir out && cd out
-        cmake .. -DENABLE_PYTHON=OFF -DENABLE_${{ matrix.avx }}=ON -DCMAKE_INSTALL_PREFIX=${{ matrix.configuration }}
-    - name: build
-      run: |
-        cd out
-        # "-j" spawns too many processes causing GCC to crash
-        cmake --build . -j 12
-    - name: test
-    # should run w/o install
-      run: |
-        cd out
-        ctest --output-on-failure
-
-  build-waf:
-    strategy:
-      matrix:
-        os: [
-            # BROKEN: windows-latest, 
-            ubuntu-22.04]
-        python-version: ['3.7']
-        debugging: ['--enable-debugging', '']
-    name: ${{ matrix.os }}-${{ matrix.python-version }}-waf${{ matrix.debugging }}
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Skip Duplicate Actions
-      uses: fkirc/skip-duplicate-actions@v5.3.1
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
-    - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
+    - name: Setup Cpp
+      uses: aminya/setup-cpp@v1 # https://github.com/marketplace/actions/setup-cpp-c-c
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: configure_with_swig
-      if: ${{ matrix.os == 'ubuntu-22.04' }}
-      run: |
-        pip install numpy
-        mkdir install${{ matrix.os }}Waf-Github
-        python waf configure --prefix="$PWD/install${{ matrix.os }}Waf-Github" --enable-swig ${{ matrix.debugging }}
-    - name: configure_without_swig
-      if: ${{ matrix.os == 'windows-latest' }}
+          compiler: gcc-14
+    - name: configure
       run: |
-        pip install numpy
-        mkdir install${{ matrix.os }}Waf-Github
-        python waf configure --prefix="$PWD/install${{ matrix.os }}Waf-Github" ${{ matrix.debugging }}
+        mkdir target && cd target
+        cmake .. -DENABLE_${{ matrix.avx }}=ON -DCMAKE_INSTALL_PREFIX=${{ matrix.configuration }} -DCMAKE_BUILD_TYPE=${{ matrix.configuration }}
     - name: build
       run: |
-        python waf build
-    - name: install
-      run: |
-        python waf install
+        cmake --build target -j
     - name: test
       run: |
-        python waf install --alltests
-
+        ctest --test-dir target --output-on-failure

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 install/
 install-*/
 target/
+build/
 
 # Conan
 modules/drivers/**/build
@@ -21,14 +22,8 @@ Makefile
 modules/**/Makefile
 out/
 CMakeSettings.json
-
-# Waf
-.waf-*
-waf-*
-.waf3-*
-waf3-*
-.lock-waf*
-build/waf*/
+# Ref: https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html
+CMakeUserPresets.json
 
 # Eclipse
 .project
@@ -52,5 +47,8 @@ project.sln
 **/x64/
 *.vcxproj.user
 
+# VSCode
+.vscode/
+
 # Unit-tests
 TEST_*_TMP*.*

CMakeLists.txt

@@ -2,8 +2,8 @@
 #
 # Author:  Scott A. Colcord
 
-cmake_minimum_required(VERSION 3.14)
-project(coda-oss VERSION 1.0.0)
+cmake_minimum_required(VERSION 3.26)
+project(coda-oss VERSION 2.0.0 LANGUAGES C CXX)
 
 if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
     # build and package with conan
@@ -13,20 +13,24 @@ if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
     include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
 endif()
 
+if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
+    message(FATAL_ERROR "CODA-OSS require at least gcc-14")
+endif()
+
 if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
     # this is the top level project
 
-    # Allow other project to set different standard. 
-    set(CMAKE_CXX_STANDARD 14)
+    # Only set std if not used as library
+    set(CMAKE_CXX_STANDARD 23)
     set(CXX_STANDARD_REQUIRED true)
 
     # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output;
     # we'll dial-back warnings as necessary.
     if (MSVC)
-       add_compile_options(/WX) # warnings as errors
-       add_compile_options(/MP) # multi-processor compile
+        # No warnings as errors for MSVC
+        add_compile_options(/MP) # multi-processor compile
     elseif (UNIX)
-       add_compile_options(-Werror) # warnings as errors
+        add_compile_options(-Werror) # warnings as errors
     endif()
 
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -44,14 +48,15 @@ if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
     include(CMakePackageConfigHelpers)
     write_basic_package_version_file(${version_file} VERSION ${CMAKE_PROJECT_VERSION} COMPATIBILITY SameMajorVersion)
     install(FILES ${version_file} DESTINATION "lib/cmake")
-    
+
+    # As opposed to drivers, these are "required" third-party packages
+    add_subdirectory(externals)
+
 endif()
 
 add_subdirectory("modules")
 
 # generate package config, with the following paths exported
 set(JARS_DIR ${CODA_STD_PROJECT_LIB_DIR} CACHE INTERNAL
     "path to installed jars, needed by downstream projects")
-set(SWIG_INCLUDE_DIR "${CODA_STD_PROJECT_INCLUDE_DIR}/swig" CACHE INTERNAL
-    "path to installed SWIG includes, needed by downstream projects")
-coda_generate_package_config(JARS_DIR SWIG_INCLUDE_DIR)
+coda_generate_package_config(JARS_DIR)