Skip to content

Fix macOS build support - resolve duplicate UNIX conditions and add proper platform detection #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Parent: Clang support
wants to merge 5 commits into
base: feature/GRIDEDIT-554_macos_and_clag_support
Choose a base branch
from
Draft

Fix macOS build support - resolve duplicate UNIX conditions and add proper platform detection #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3b735c
Initial plan
Copilot Oct 8, 2025
299fb0a
Fix macOS build support across configuration files
Copilot Oct 8, 2025
fd7e161
Remove _CRT_SECURE_NO_WARNINGS to fix Windows builds
Copilot Oct 8, 2025
da2e9fc
Restrict macOS support to ARM64 only in download_sonar_tools.py
Copilot Oct 8, 2025
44c3cf8
Revert cmake/compiler_config.cmake changes to fix Windows/Linux builds
Copilot Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions scripts/download_sonar_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ def get_build_wrapper(save_dir: Path) -> None:
url = "https://sonarcloud.io/static/cpp/build-wrapper-win-x86.zip"
elif platform.system() == "Linux":
url = "http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip"
elif platform.system() == "Darwin":
if platform.machine() != "arm64":
raise Exception("Only macOS ARM64 (Apple Silicon) is supported.")
url = "https://sonarcloud.io/static/cpp/build-wrapper-macosx-x86.zip"
else:
raise Exception("Unsupported OS used.")

Expand All @@ -51,6 +55,10 @@ def get_scanner(save_dir: Path) -> None:
url = f"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-{SONAR_SCANNER_VERSION}-windows.zip"
elif platform.system() == "Linux":
url = f"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-{SONAR_SCANNER_VERSION}-linux.zip"
elif platform.system() == "Darwin":
if platform.machine() != "arm64":
raise Exception("Only macOS ARM64 (Apple Silicon) is supported.")
url = f"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-{SONAR_SCANNER_VERSION}-macosx.zip"
else:
raise Exception("Unsupported OS used.")

Expand Down
16 changes: 11 additions & 5 deletions scripts/install_netcdf_static.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Function Join-Paths {
}

# No need to download and extract m4 when platform is WIN32
if ($PSVersionTable.Platform -ne 'Unix') {
if ($IsWindows) {
# ----------------------------------------------------------------------------------------
# Download
# ----------------------------------------------------------------------------------------
Expand Down Expand Up @@ -307,7 +307,7 @@ $env:Path += (';' + $CurlInstallDir)
$HDF5BuildDir = (Join-Path $BuildDir $HDF5)
$HDF5InstallDir = (Join-Path $LocalInstallDir $HDF5)
$ZlibIncludeDir = (Join-Path $ZLIBInstallDir 'include')
if ($PSVersionTable.Platform -eq 'Unix') {
if ($IsLinux -or $IsMacOS) {
$ZlibStaticLibrary = (Join-Path (Join-Path $ZLIBInstallDir 'lib') 'libz.a')
}
else {
Expand Down Expand Up @@ -347,7 +347,7 @@ $NetCDFCMakeBuildOptions = @(`
'-DENABLE_DAP=OFF', `
'-DENABLE_BYTERANGE=OFF' `
)
if ($PSVersionTable.Platform -eq 'Unix') {
if ($IsLinux -or $IsMacOS) {
$NetCDFCMakeBuildOptions += '-DCMAKE_POSITION_INDEPENDENT_CODE=ON'
}

Expand All @@ -369,7 +369,7 @@ Invoke-BuildAndInstall `
Function Invoke-Post-Build-Steps() {
# Copy all necessary static libraries from the local instalaltion directory to the netcdf lib dir
$NetCDFLibDir = (Join-Path $NetCDFInstallDir 'lib')
if ($PSVersionTable.Platform -eq 'Unix') {
if ($IsLinux -or $IsMacOS) {
$NetCDFBinDir = (Join-Path $NetCDFInstallDir 'bin')
Copy-Item (Join-Paths $ZLIBInstallDir 'lib' 'libz.a') -Destination (Join-Path $NetCDFLibDir 'libz.a')
Copy-Item (Join-Paths $ZLIBInstallDir 'lib' 'libz.so') -Destination (Join-Path $NetCDFBinDir 'libz.so')
Expand Down Expand Up @@ -397,9 +397,15 @@ Function Invoke-Post-Build-Steps() {
}

# Replace the line above to list the public interface libararies in ${_IMPORT_PREFIX}/lib (libs copied and renamed above)
if ($PSVersionTable.Platform -eq 'Unix') {
if ($IsLinux) {
$NewLine = ' INTERFACE_LINK_LIBRARIES "dl;${_IMPORT_PREFIX}/lib/libhdf5_hl.a;${_IMPORT_PREFIX}/lib/libhdf5.a;${_IMPORT_PREFIX}/lib/libz.a;${_IMPORT_PREFIX}/bin/libz.so"'
}
elseif ($IsMacOS) {
$NewLine = $Line
$NewLine = $NewLine.Replace($HDF5InstallDir, '${_IMPORT_PREFIX}')
$NewLine = $NewLine.Replace($ZLIBInstallDir, '${_IMPORT_PREFIX}')
$NewLine = $NewLine.Replace($CurlInstallDir, '${_IMPORT_PREFIX}')
}
else {
$NewLine = ' INTERFACE_LINK_LIBRARIES "${_IMPORT_PREFIX}/lib/hdf5_hl-static.lib;${_IMPORT_PREFIX}/lib/hdf5-static.lib;${_IMPORT_PREFIX}/lib/zlib.lib"'
}
Expand Down
Loading