Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Trying to get the dependencies loaded in the windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Sep 27, 2023
1 parent 5204862 commit 0f27a0e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 7 deletions.
12 changes: 10 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,20 @@ IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
ENDIF()

FIND_PACKAGE(NETCDF_Fortran REQUIRED)
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
IF (MSVC)
FIND_PACKAGE(HDF5 NAMES hdf5 COMPONENTS C HL REQUIRED CONFIG)
MESSAGE(STATUS "HDF5_FOUND: ${HDF5_FOUND}")
MESSAGE(STATUS "HDF5_VERSION: ${HDF5_VERSION}")
MESSAGE(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
MESSAGE(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}")
ELSE ()
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
ENDIF ()

# Ensure scikit-build modules
FIND_PACKAGE(Python COMPONENTS Interpreter Development.Module REQUIRED)

# Define some directories that are important to the build

SET(SRC "${CMAKE_SOURCE_DIR}/src")
SET(PY "${CMAKE_SOURCE_DIR}/swiftest")

Expand Down
2 changes: 1 addition & 1 deletion buildscripts/windows/netcdf-c-cacheinit-windows.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ set (BUILD_SHARED_LIBS OFF CACHE BOOL "Build with shared libraries" FORCE)
set (HDF5_DIR "C:/Program Files/HDF_Group/HDF5/1.14.2/cmake" CACHE PATH "Location of HDF5 cmake files" FORCE)
set (HDF5_ROOT "C:/Program Files/HDF_Group/HDF5/1.14.2" CACHE PATH "Location of HDF5" FORCE)

SET(ZLIB_LIBRARY "C:/Program Files (x86)/zlib/zlib.lib" CACHE FILEPATH "ZLIB library file" FORCE)
SET(ZLIB_LIBRARY "C:/Program Files (x86)/zlib/lib/zlib.lib" CACHE FILEPATH "ZLIB library file" FORCE)
SET(ZLIB_INCLUDE_DIR "C:/Program Files (x86)/zlib/include" CACHE PATH "ZLIB include directory" FORCE)

# Set build type can be: empty, Debug, Release, RelWithDebInfo or MinSizeRel
Expand Down
5 changes: 3 additions & 2 deletions buildscripts/windows/netcdf-fortran-cacheinit-windows.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SET(netCDF_INCLUDE_DIR "C:/Program Files/netCDF 4.9.2/include" CACHE PATH "Path to NetCDF-C include directory" FORCE)
SET(netCDF_LIBRARIES "C:/Program Files/netCDF 4.9.2/lib/netcdf.lib" CACHE FILEPATH "Location of NetCDF-C library file" FORCE)
SET(netCDF_DIR "C:/Program Files/netCDF/lib/cmake/netCDF" CACHE PATH "Location of NetCDF-C cmake config files" FORCE)
SET(HDF5_DIR "C:/Program Files/HDF5_Group/HDF5/1.14.2/cmake" CACHE PATH "Location of HDF5 cmake config files" FORCE)
SET(HDF5_ROOT "C:/Program Files/HDF5_Group/HDF5/1.14.2" CACHE PATH "Location of HDF5" FORCE)
SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Use shared libraries" FORCE)
SET(CMAKE_INSTALL_PREFIX "C:/Program Files/NC4F" CACHE PATH "Installation location" FORCE)
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Compile build type" FORCE)
7 changes: 7 additions & 0 deletions buildscripts/windows/swiftest-cacheinint-windows.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
SET(USE_OPENMP ON CACHE BOOL "Use OpenMP" FORCE)
SET(USE_SIMD OFF CACHE BOOL "Use SIMD instructions" FORCE)
SET(netCDF-Fortran_DIR "C:/Program Files/NC4F/lib/cmake/netCDF" CACHE PATH "Location of NetCDF-Fortran cmake config files" FORCE)
SET(HDF5_DIR "C:/Program Files/HDF5_Group/HDF5/1.14.2/cmake" CACHE PATH "Location of HDF5 cmake config files" FORCE)
SET(HDF5_ROOT "C:/Program Files/HDF5_Group/HDF5/1.14.2" CACHE PATH "Location of HDF5" FORCE)
SET(HDF5_USE_STATIC_LIBRARIES ON CACHE BOOL "Use static HDF5 libraries" FORCE)
5 changes: 3 additions & 2 deletions cmake/Modules/FindNETCDF_Fortran.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ELSE ()
SET(NETCDF "netcdf.lib")
SET(HDF5 "libhdf5.lib")
SET(HDF5_HL "libhdf5_hl.lib")
SET(ZLIB "zlibstatic.lib")
SET(ZLIB "zlib.lib")
ELSE ()
SET(NETCDFF "libnetcdff.a")
SET(NETCDF "libnetcdf.a")
Expand All @@ -151,7 +151,7 @@ ELSE ()
REQUIRED
)
ADD_LIBRARY(netCDF::netcdff UNKNOWN IMPORTED PUBLIC)
IF (CMAKE_SYSTEM_NAME STREQUAL "Windows")
IF (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND BUILD_SHARED_LIBS)
# Get the DLL added in
FIND_FILE(NFDLL
NAMES "netcdff.dll"
Expand Down Expand Up @@ -179,5 +179,6 @@ ELSE ()
MESSAGE(STATUS "NetCDF-Fortran include directory: ${NETCDF_FORTRAN_INCLUDE_DIR}")
ENDIF ()


SET(NETCDF_FORTRAN_FOUND TRUE)
MARK_AS_ADVANCED(NETCDF_FORTRAN_LIBRARY NETCDF_FORTRAN_INCLUDE_DIR)

0 comments on commit 0f27a0e

Please sign in to comment.