Commit 3f126cb1 authored by Kenneth Leiter's avatar Kenneth Leiter
Browse files

COMP: Mark needed variables as unadvanced before they are found.

Makes identifying required variables easier for users,
especially for hdf5 variables where only the C library is needed
for linking.
parent 36149071
...@@ -15,14 +15,22 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ...@@ -15,14 +15,22 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
option(XDMF_BUILD_DSM OFF) option(XDMF_BUILD_DSM OFF)
mark_as_advanced(CLEAR Boost_INCLUDE_DIR)
find_package(Boost REQUIRED) find_package(Boost REQUIRED)
if(Boost_FOUND) if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
mark_as_advanced(FORCE Boost_INCLUDE_DIR)
endif(Boost_FOUND) endif(Boost_FOUND)
mark_as_advanced(CLEAR HDF5_C_INCLUDE_DIR)
mark_as_advanced(CLEAR HDF5_hdf5_LIBRARY_DEBUG)
mark_as_advanced(CLEAR HDF5_hdf5_LIBRARY_RELEASE)
find_package(HDF5 REQUIRED) find_package(HDF5 REQUIRED)
if(HDF5_FOUND) if(HDF5_FOUND)
include_directories(${HDF5_INCLUDE_DIR}) include_directories(${HDF5_INCLUDE_DIRS})
mark_as_advanced(FORCE HDF5_C_INCLUDE_DIR)
mark_as_advanced(FORCE HDF5_hdf5_LIBRARY_DEBUG)
mark_as_advanced(FORCE HDF5_hdf5_LIBRARY_RELEASE)
endif(HDF5_FOUND) endif(HDF5_FOUND)
if(XDMF_BUILD_DSM) if(XDMF_BUILD_DSM)
...@@ -71,7 +79,7 @@ if(XDMF_BUILD_DSM) ...@@ -71,7 +79,7 @@ if(XDMF_BUILD_DSM)
endif(XDMF_BUILD_DSM) endif(XDMF_BUILD_DSM)
add_library(XdmfCore ${XdmfCoreSources}) add_library(XdmfCore ${XdmfCoreSources})
target_link_libraries(XdmfCore ${HDF5_LIBRARIES} ${HDF5DSM_LIBRARIES} ${LIBXML2_LIBRARIES}) target_link_libraries(XdmfCore ${HDF5_hdf5_LIBRARY} ${HDF5DSM_LIBRARIES} ${LIBXML2_LIBRARIES})
if(WIN32) if(WIN32)
add_definitions(-D_HDF5USEDLL_ -D_HDF5USEHLDLL_) add_definitions(-D_HDF5USEDLL_ -D_HDF5USEHLDLL_)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment