Skip to content

Commit a7072dd

Browse files
committed
WIP: ftkconfig.cmake
1 parent 85b13d3 commit a7072dd

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ endif ()
160160
if (NETCDF_FOUND)
161161
set (FTK_HAVE_NETCDF TRUE)
162162
include_directories (${NETCDF_INCLUDE_DIR})
163+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindNetCDF.cmake
164+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/FTK/)
163165
endif ()
164166

165167
if (FTK_USE_MPSolve STREQUAL AUTO)
@@ -448,7 +450,7 @@ if (${FTK_HAVE_OPENMP})
448450
message(" Flags: ${OpenMP_CXX_FLAGS}")
449451
message(" Library: ${OpenMP_CXX_LIBRARY}")
450452
endif ()
451-
message(" PNETCDF: ${FTK_USE_PNETCDF} ${PNetCDF_FOUND}")
453+
message(" PNETCDF*: ${FTK_USE_PNETCDF} ${PNetCDF_FOUND}")
452454
message(" PNG: ${FTK_USE_PNG} ${PNG_FOUND}")
453455
if (${FTK_HAVE_PNG})
454456
message(" Library: ${PNG_LIBRARY}")

cmake/FTKConfig.cmake.in

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,34 @@
55
include(CMakeFindDependencyMacro)
66
include("${CMAKE_CURRENT_LIST_DIR}/ftkTargets.cmake")
77

8+
list (INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")
9+
10+
set (FTK_HAVE_ADIOS2 @FTK_HAVE_ADIOS2@)
811
set (FTK_HAVE_GMP @FTK_HAVE_GMP@)
12+
set (FTK_HAVE_HDF5 @FTK_HAVE_HDF5@)
913
set (FTK_HAVE_MPI @FTK_HAVE_MPI@)
1014
set (FTK_HAVE_NETCDF @FTK_HAVE_NETCDF@)
1115
set (FTK_HAVE_VTK @FTK_HAVE_VTK@)
1216

17+
if (FTK_HAVE_ADIOS2)
18+
find_dependency (ADIOS2 REQUIRED)
19+
endif ()
20+
1321
if (FTK_HAVE_VTK)
14-
find_dependency (VTK ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
22+
find_dependency (VTK @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@ REQUIRED)
1523
endif ()
1624

1725
if (FTK_HAVE_MPI)
1826
find_dependency (MPI REQUIRED)
1927
include_directories (${MPI_C_INCLUDE_PATH})
2028
endif ()
2129

30+
if (FTK_HAVE_HDF5)
31+
find_dependency (HDF5 REQUIRED)
32+
endif ()
33+
2234
if (FTK_HAVE_NETCDF)
23-
# find_dependency (NetCDF REQUIRED) # TODO
35+
find_dependency (NetCDF REQUIRED)
2436
endif ()
2537

2638
set (FTK_INCLUDE_DIR "@FTK_INCLUDE_DIR@")

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ add_library (libftk SHARED ${ftk_sources} ${ftk_cuda_sources})
3838
target_link_libraries (libftk ${CMAKE_THREAD_LIBS_INIT})
3939

4040
if (FTK_HAVE_ADIOS2)
41-
target_link_libraries (libftk ${ADIOS2_LIBRARIES})
41+
target_link_libraries (libftk adios2::adios2)
4242
endif ()
4343

4444
if (FTK_HAVE_BOOST)

0 commit comments

Comments
 (0)