cmake: revert some changes; include UDUNITS2_INCLUDE at compiler level

NOAA-OWP · Sep 8, 2023 · 4064d11 · 4064d11
1 parent a04cde6
commit 4064d11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -141,12 +141,9 @@ if(NGEN_WITH_UDUNITS)
     # Create UDUNITS2 target
     # Note: GLOBAL is required here in order to extend the scope of the target.
     #       see: https://stackoverflow.com/a/46491758/6891484
-    add_library(libudunits2::library SHARED IMPORTED GLOBAL)
-    set_target_properties(libudunits2::library PROPERTIES IMPORTED_LOCATION "${UDUNITS2_LIBRARY}")
-
-    add_library(libudunits2 INTERFACE IMPORTED)
+    add_library(libudunits2 SHARED IMPORTED GLOBAL)
+    set_target_properties(libudunits2 PROPERTIES IMPORTED_LOCATION "${UDUNITS2_LIBRARY}")
     target_include_directories(libudunits2 INTERFACE "${UDUNITS2_INCLUDE}")
-    target_link_libraries(libudunits2 INTERFACE libudunits2::library)
 
     get_target_property(_SUMMARY_UDUNITS_INCLUDE libudunits2 INTERFACE_INCLUDE_DIRECTORIES)
 endif()

diff --git a/cmake/FindUDUNITS2.cmake b/cmake/FindUDUNITS2.cmake
@@ -20,3 +20,8 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(UDUNITS2 DEFAULT_MSG UDUNITS2_LIBRARY UDUNITS2_INCLUDE)
+
+# Based on: https://stackoverflow.com/questions/26834553/osx-10-10-cmake-3-0-2-and-clang-wont-find-local-headers
+if(UDUNITS2_FOUND)
+    include_directories(${UDUNITS2_INCLUDE})
+endif()