Browse Source

Add HDF4 include dirs also in cmake config mode

Moritz Wanzenböck 6 years ago
parent
commit
a4154eaee4
2 changed files with 7 additions and 1 deletions
  1. 4 1
      CMakeLists.txt
  2. 3 0
      cmake/FindHDF4.cmake

+ 4 - 1
CMakeLists.txt

@@ -47,7 +47,7 @@ add_library(hdf4cpp
 target_include_directories(hdf4cpp
         PUBLIC
         include/
-        ${HDF4_INCLUDE_DIR}
+        ${HDF4_INCLUDE_DIRS}
         )
 
 target_link_libraries(hdf4cpp
@@ -77,6 +77,9 @@ target_link_libraries(hdf4cpp-tests
         ${CMAKE_THREAD_LIBS_INIT}
         hdf4cpp
         )
+target_compile_definitions(hdf4cpp-tests PRIVATE
+        GTEST_DONT_DEFINE_FAIL
+        GTEST_DONT_DEFINE_SUCCEED)
 
 
 if (NOT DEFINED TEST_DATA_PATH)

+ 3 - 0
cmake/FindHDF4.cmake

@@ -9,6 +9,9 @@ find_package(HDF4 CONFIG QUIET)
 
 if (HDF4_FOUND)
     set(HDF4_LIBRARIES hdf4::mfhdf-static hdf4::hdf-static)
+    set(HDF4_INCLUDE_DIRS
+            $<TARGET_PROPERTY:hdf4::mfhdf-static,INTERFACE_INCLUDE_DIRECTORIES>
+            $<TARGET_PROPERTY:hdf4::hdf-static,INTERFACE_INCLUDE_DIRECTORIES>)
 else ()
     find_path(HDF4_INCLUDE_DIRS hdf.h PATH_SUFFIXES hdf)
     find_library(MFHDF_LIB NAMES mfhdf mfhdfalt)