UGRID-43: Handle SWIGTYPE_P_<T>

.github/workflows/build-macos.yml

@@ -49,6 +49,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      # Explicitly set the Xcode version for macos-13. With the default (newer), GCC
+      # fails to find some components of the standard library which causes build failure.
+      # This should not happen if clang is used instead (clang has better support under macOS).
+      # Setting a newer GCC version in the env section might also resolve the issue.
+      # The Linux Docker build must use the same version for consistency.
+      - name: Set Xcode version
+        if: startsWith(matrix.platform, 'macos-13')
+        run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer
+
       # Step: Set paths
       - name: Set paths
         id: paths
@@ -111,7 +120,8 @@ jobs:
       # Step: Configure
       - name: Configure
         run: |
-          export netCDFCxx_DIR=${{ steps.paths.outputs.ext_deps_dir }}/install/netcdf_cxx4/lib/cmake/netCDF/
+          export netCDFCxx_DIR=${{ steps.paths.outputs.ext_deps_dir }}/install/netcdf_cxx4/lib/cmake/netCDF
+          export OPENSSL_ROOT_DIR=$(brew --prefix openssl)
           cmake \
             -S ${{ github.workspace }} \
             -B ${{ steps.paths.outputs.build_dir }} \

CMakeLists.txt

@@ -1,45 +1,45 @@
-cmake_minimum_required(VERSION 3.23)
-
-# cached globals
-include(cmake/cached_globals.cmake)
-
-project(
-  UGrid
-  VERSION ${GLOB_UGRID_PROJECT_VERSION}
-  DESCRIPTION "Library for reading and writing UGrid files."
-  LANGUAGES CXX C
-)
-
-# configuration options
-if (NOT WIN32)
-  message(NOTICE "Build type: ${CMAKE_BUILD_TYPE}")
-endif()
-
-# configuration options
-include(cmake/user_config_options.cmake)
-
-# configure the compiler
-include(cmake/compiler_config.cmake)
-
-# fetch dependencies, must appear after options.cmake
-include(cmake/fetch_contents.cmake)
-
-# find required packages
-include(cmake/find_packages.cmake)
-
-# organize targets into folders, can be remove in version > 3.26 (ON by default)
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-# Docs only available if this is the main app
-add_subdirectory(docs)
-
-# Run packaging scripts: requires semantic version
-add_subdirectory(package)
-
-# Libraries
-add_subdirectory(libs)
-
-# Add unit tests
-if(ENABLE_UNIT_TESTING)
-  add_subdirectory(tests)
-endif()
+cmake_minimum_required(VERSION 3.23)
+
+# cached globals
+include(cmake/cached_globals.cmake)
+
+project(
+  UGrid
+  VERSION ${GLOB_UGRID_PROJECT_VERSION}
+  DESCRIPTION "Library for reading and writing UGrid files."
+  LANGUAGES CXX C
+)
+
+# configuration options
+if (NOT WIN32)
+  message(NOTICE "Build type: ${CMAKE_BUILD_TYPE}")
+endif()
+
+# configuration options
+include(cmake/user_config_options.cmake)
+
+# configure the compiler
+include(cmake/compiler_config.cmake)
+
+# fetch dependencies, must appear after options.cmake
+include(cmake/fetch_contents.cmake)
+
+# find required packages
+include(cmake/find_packages.cmake)
+
+# organize targets into folders, can be remove in version > 3.26 (ON by default)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+# Docs only available if this is the main app
+add_subdirectory(docs)
+
+# Run packaging scripts: requires semantic version
+add_subdirectory(package)
+
+# Libraries
+add_subdirectory(libs)
+
+# Add unit tests
+if(ENABLE_UNIT_TESTING)
+  add_subdirectory(tests)
+endif()

cmake/cached_globals.cmake

@@ -18,17 +18,17 @@ string(TIMESTAMP GLOB_CURRENT_YEAR "%Y")
 set(GLOB_CURRENT_YEAR ${GLOB_CURRENT_YEAR} CACHE STRING "Current year")
 
 # .NET config
-if(WIN32 AND BUILD_DOTNET_WRAPPER)
+if(BUILD_DOTNET_WRAPPER)
   # .NET SDK
   set(GLOB_DOTNET_SDK "Microsoft.NET.Sdk" CACHE STRING ".NET SDK")
-  # .NET target frameworks
+  # List of .NET target frameworks (semicolon-delimited)
   # Note: Even if the list consists of a single element, make sure to terminate with a semicolon
   #       For ex: set(LIST_OF_DOTNET_TARGET_FRAMEWORKS "net481;" CACHE STRING "Supported .NET target framework")
   #       Otherwise, Visual Studio will not create subdir net481 under Release (of whichever build config is used) in the CMake binary dir
   #       <TargetFramework>net481</TargetFramework> works (notice the singular form in xml element "TargetFramework")
   #       <TargetFrameworks>net481</TargetFrameworks> does not work (notice the plural form in xml element "TargetFrameworks")
   #       <TargetFrameworks>net481;</TargetFrameworks> works (notice the plural form in xml element "TargetFrameworks" and the semicolon after "net481")
-  set(GLOB_LIB_DOTNET_TARGET_FRAMEWORKS "netstandard2.0;net481" CACHE STRING "Library .NET target framework")
+  set(GLOB_LIB_DOTNET_TARGET_FRAMEWORKS "netstandard2.0;" CACHE STRING "Library .NET target framework")
   set(GLOB_TEST_DOTNET_TARGET_FRAMEWORKS "net481;" CACHE STRING "Test .NET target framework")
   # .NET language version
   set(GLOB_CSHARP_LANGUAGE_VERSION "7.3" CACHE STRING "C# Compiler Options for language feature rules") 

cmake/compiler_config.cmake

@@ -1,32 +1,32 @@
-# Set the C++ standard
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# Disable compiler-specific extensions
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Create position-independent executables and shared libraries
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-# Add compiler-specific options and definitions per supported platform
-if (UNIX)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:-fvisibility=hidden;-Werror;-Wall;-Wextra;-pedantic;-Wno-unused-function>")
-    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>:-O2>")
-    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>:-g>")
-  else()
-    message(FATAL_ERROR "Unsupported compiler. Only GNU is supported under Linux. Found ${CMAKE_CXX_COMPILER_ID}.")
-  endif()
-elseif(WIN32)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/EHsc;/MP;/W3;/WX>")
-    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>:/O2>")
-    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>:/Od;/DEBUG>")
-    add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:_USE_MATH_DEFINES>")
-    add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:_CRT_SECURE_NO_WARNINGS>")
-  else()
-    message(FATAL_ERROR "Unsupported compiler. Only MSVC is supported under Windows. Found ${CMAKE_CXX_COMPILER_ID}.")
-  endif()
-else()
-    message(FATAL_ERROR "Unsupported platform. Only Linux and Windows are supported.")
-endif()
+# Set the C++ standard
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Disable compiler-specific extensions
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Create position-independent executables and shared libraries
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Add compiler-specific options and definitions per supported platform
+if (UNIX)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:-fvisibility=hidden;-Werror;-Wall;-Wextra;-pedantic;-Wno-unused-function>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>:-O2>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>:-g>")
+  else()
+    message(FATAL_ERROR "Unsupported compiler. Only GNU is supported under Linux. Found ${CMAKE_CXX_COMPILER_ID}.")
+  endif()
+elseif(WIN32)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/EHsc;/MP;/MD;/W3;/WX>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>:/O2>")
+    add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>:/Od;/DEBUG>")
+    add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:_USE_MATH_DEFINES>")
+    add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:_CRT_SECURE_NO_WARNINGS>")
+  else()
+    message(FATAL_ERROR "Unsupported compiler. Only MSVC is supported under Windows. Found ${CMAKE_CXX_COMPILER_ID}.")
+  endif()
+else()
+    message(FATAL_ERROR "Unsupported platform. Only Linux and Windows are supported.")
+endif()

cmake/fetch_contents.cmake

@@ -1,41 +1,41 @@
-include(FetchContent)
-
-if(ENABLE_UNIT_TESTING)
-
-# Fetch googletest
-  set(googletest_url "https://github.com/google/googletest.git")
-  set(googletest_tag "v1.13.0")
-  set(cmake_FetchContent_Populate_deprecation_version "3.30.0")
-
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL "${cmake_FetchContent_Populate_deprecation_version}")
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY ${googletest_url}
-      GIT_TAG ${googletest_tag}
-      EXCLUDE_FROM_ALL # available from v3.28.0+
-    )
-  else()
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY ${googletest_url}
-      GIT_TAG ${googletest_tag}
-    )
-  endif()
-
-  if(WIN32)
-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-  endif()
-
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL "${cmake_FetchContent_Populate_deprecation_version}")
-    FetchContent_MakeAvailable(googletest)
-  else()
-    # deprecated
-    FetchContent_GetProperties(googletest)
-    if(NOT googletest_POPULATED)
-      FetchContent_Populate(googletest)
-      add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
-  endif()
-  
-  enable_testing()
-endif()
+include(FetchContent)
+
+if(ENABLE_UNIT_TESTING)
+
+# Fetch googletest
+  set(googletest_url "https://github.com/google/googletest.git")
+  set(googletest_tag "v1.15.1")
+  set(cmake_FetchContent_Populate_deprecation_version "3.30.0")
+
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL "${cmake_FetchContent_Populate_deprecation_version}")
+    FetchContent_Declare(
+      googletest
+      GIT_REPOSITORY ${googletest_url}
+      GIT_TAG ${googletest_tag}
+      EXCLUDE_FROM_ALL # available from v3.28.0+
+    )
+  else()
+    FetchContent_Declare(
+      googletest
+      GIT_REPOSITORY ${googletest_url}
+      GIT_TAG ${googletest_tag}
+    )
+  endif()
+
+  if(WIN32)
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+  endif()
+
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL "${cmake_FetchContent_Populate_deprecation_version}")
+    FetchContent_MakeAvailable(googletest)
+  else()
+    # deprecated
+    FetchContent_GetProperties(googletest)
+    if(NOT googletest_POPULATED)
+      FetchContent_Populate(googletest)
+      add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+    endif()
+  endif()
+
+  enable_testing()
+endif()