From 425408b5a13bdb4bab369846cd9f9108b058cb82 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 25 Mar 2014 13:25:53 -0500 Subject: [svn-r24895] Add INTERFACE properties to libs --- c++/src/CMakeLists.txt | 5 ++++- fortran/src/CMakeLists.txt | 12 +++++++++--- fortran/test/CMakeLists.txt | 10 ++++++++-- hl/c++/src/CMakeLists.txt | 5 ++++- tools/lib/CMakeLists.txt | 5 ++++- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 7054b04..7a48260 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -88,7 +88,10 @@ TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} " " " ") target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} ${LIB_TYPE}) -set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/cpp) +set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES + FOLDER libraries/cpp + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) #----------------------------------------------------------------------------- # Add file(s) to CMake Install diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index a8312a5..ba13ba5 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -137,8 +137,11 @@ TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} " " " ") target_link_libraries (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE}) -set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES FOLDER libraries/fortran) -set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES LINKER_LANGUAGE C) +set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES + FOLDER libraries/fortran + LINKER_LANGUAGE C + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) #----------------------------------------------------------------------------- # Fortran 2003 standard @@ -242,7 +245,10 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE}) -set_target_properties (${HDF5_F90_LIB_TARGET} PROPERTIES FOLDER libraries/fortran) +set_target_properties (${HDF5_F90_LIB_TARGET} PROPERTIES + FOLDER libraries/fortran + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) #----------------------------------------------------------------------------- # Add file(s) to CMake Install diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index ff88919..42614ba 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -16,7 +16,10 @@ target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ) H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE}) -set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran) +set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES + FOLDER libraries/test/fortran + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90) set (SHARED_LINK_FLAGS " ") @@ -37,7 +40,10 @@ target_link_libraries (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} ) H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE}) -set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran) +set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES + FOLDER libraries/test/fortran + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) #----------------------------------------------------------------------------- # Add Tests diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index 39c6737..9776f06 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -19,7 +19,10 @@ target_link_libraries ( ) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} ${LIB_TYPE}) -set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/hl) +set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES + FOLDER libraries/hl + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) #----------------------------------------------------------------------------- # Add file(s) to CMake Install diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index 83df182..c3b8294 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -47,7 +47,10 @@ H5_SET_LIB_OPTIONS ( HDF5_TOOLS_LIB_NAME_DEBUG ) #set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES COMPILE_DEFINITIONS H5DIFF_DEBUG) -set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES FOLDER libraries/tools) +set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES + FOLDER libraries/tools + INTERFACE_INCLUDE_DIRECTORIES "$/include>" +) ############################################################################## ############################################################################## -- cgit v0.12