shared lib options

Author: scivision

.archive/netcdf.cmake

@@ -63,8 +63,7 @@ DEPENDS HDF5::HDF5
 file(MAKE_DIRECTORY ${NetCDF_C_INCLUDE_DIRS})
 # avoid race condition
 
-# this GLOBAL is required to be visible via other project's FetchContent
-add_library(NetCDF::NetCDF_C INTERFACE IMPORTED GLOBAL)
+add_library(NetCDF::NetCDF_C INTERFACE IMPORTED)
 target_include_directories(NetCDF::NetCDF_C INTERFACE ${NetCDF_C_INCLUDE_DIRS})
 target_link_libraries(NetCDF::NetCDF_C INTERFACE ${NetCDF_C_LIBRARIES})
 
@@ -75,7 +74,7 @@ target_link_libraries(NetCDF::NetCDF_C INTERFACE HDF5::HDF5)
 
 # --- NetCDF-Fortran
 
-cmake_path(SET NetCDF_Fortran_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
+cmake_path(SET NetCDF_Fortran_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 
 set(netcdf_fortran_cmake_args
 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
@@ -109,8 +108,7 @@ DEPENDS NETCDF_C
 
 # --- imported target
 
-# this GLOBAL is required to be visible via other project's FetchContent
-add_library(NetCDF::NetCDF_Fortran INTERFACE IMPORTED GLOBAL)
+add_library(NetCDF::NetCDF_Fortran INTERFACE IMPORTED)
 target_include_directories(NetCDF::NetCDF_Fortran INTERFACE ${NetCDF_Fortran_INCLUDE_DIRS})
 target_link_libraries(NetCDF::NetCDF_Fortran INTERFACE ${NetCDF_Fortran_LIBRARIES} NetCDF::NetCDF_C)
 

cmake/hdf5.cmake

@@ -103,8 +103,7 @@ USES_TERMINAL_TEST true
 file(MAKE_DIRECTORY ${HDF5_INCLUDE_DIRS})
 # avoid race condition
 
-# this GLOBAL is required to be visible to parent projects
-add_library(HDF5::HDF5 INTERFACE IMPORTED GLOBAL)
+add_library(HDF5::HDF5 INTERFACE IMPORTED)
 target_include_directories(HDF5::HDF5 INTERFACE "${HDF5_INCLUDE_DIRS}")
 target_link_libraries(HDF5::HDF5 INTERFACE "${HDF5_LIBRARIES}")
 

cmake/nc4fortran.cmake

@@ -1,4 +1,4 @@
-set(NetCDF_C_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
+set(NetCDF_C_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 
 set(netcdf_c_cmake_args
 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
@@ -55,8 +55,7 @@ USES_TERMINAL_TEST true
 file(MAKE_DIRECTORY ${NetCDF_C_INCLUDE_DIRS})
 # avoid race condition
 
-# this GLOBAL is required to be visible via other project's FetchContent
-add_library(NetCDF::NetCDF_C INTERFACE IMPORTED GLOBAL)
+add_library(NetCDF::NetCDF_C INTERFACE IMPORTED)
 target_include_directories(NetCDF::NetCDF_C INTERFACE "${NetCDF_C_INCLUDE_DIRS}")
 target_link_libraries(NetCDF::NetCDF_C INTERFACE "${NetCDF_C_LIBRARIES}")
 

cmake/netcdf-c.cmake

@@ -81,8 +81,7 @@ USES_TERMINAL_TEST true
 file(MAKE_DIRECTORY ${NetCDF_Fortran_INCLUDE_DIRS})
 # avoid race condition
 
-# this GLOBAL is required to be visible via other project's FetchContent
-add_library(NetCDF::NetCDF_Fortran INTERFACE IMPORTED GLOBAL)
+add_library(NetCDF::NetCDF_Fortran INTERFACE IMPORTED)
 target_include_directories(NetCDF::NetCDF_Fortran INTERFACE "${NetCDF_Fortran_INCLUDE_DIRS}")
 target_link_libraries(NetCDF::NetCDF_Fortran INTERFACE "${NetCDF_Fortran_LIBRARIES}")
 

cmake/netcdf.cmake

@@ -53,8 +53,7 @@ USES_TERMINAL_TEST true
 file(MAKE_DIRECTORY ${ZLIB_INCLUDE_DIRS})
 # avoid race condition
 
-# for visibility in parent projects
-add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL)
+add_library(ZLIB::ZLIB INTERFACE IMPORTED)
 add_dependencies(ZLIB::ZLIB ZLIB)  # to avoid include directory race condition
 target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES})
 target_include_directories(ZLIB::ZLIB INTERFACE ${ZLIB_INCLUDE_DIRS})

cmake/zlib.cmake

@@ -43,18 +43,16 @@ EXECUTABLE ${CMAKE_CTEST_COMMAND}
 endif()
 
 # --- NetCDF shared lib paths needed
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
-  if(WIN32)
-    set_property(TEST minimal ${test_names} PROPERTY
-    ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${NetCDF_Fortran_INCLUDE_DIRS}/../bin"
-    )
-  elseif(APPLE)
-    set_property(TEST minimal ${test_names} PROPERTY
-    ENVIRONMENT_MODIFICATION "DYLD_LIBRARY_PATH=path_list_prepend:${NetCDF_Fortran_INCLUDE_DIRS}/../lib"
-    )
-  else()
-    set_property(TEST minimal ${test_names} PROPERTY
-    ENVIRONMENT_MODIFICATION "LD_LIBRARY_PATH=path_list_prepend:${NetCDF_Fortran_INCLUDE_DIRS}/../lib"
-    )
-  endif()
+if(WIN32)
+  set_property(TEST minimal ${test_names} PROPERTY
+  ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${NetCDF_Fortran_INCLUDE_DIRS}/../bin"
+  )
+elseif(APPLE)
+  set_property(TEST minimal ${test_names} PROPERTY
+  ENVIRONMENT_MODIFICATION "DYLD_LIBRARY_PATH=path_list_prepend:${NetCDF_Fortran_INCLUDE_DIRS}/../lib"
+  )
+else()
+  set_property(TEST minimal ${test_names} PROPERTY
+  ENVIRONMENT_MODIFICATION "LD_LIBRARY_PATH=path_list_prepend:${NetCDF_Fortran_INCLUDE_DIRS}/../lib"
+  )
 endif()