CMake fixes (#358)

* Add include(CMakePackageConfigHelpers) * Use modern cmake target for ign-math Signed-off-by: Juan Oxoby <juan@vicarious.com> Co-authored-by: Juan Oxoby <juan@vicarious.com>
gazebosim · Sep 7, 2020 · 5ed0a49 · 5ed0a49
1 parent d02105e
commit 5ed0a49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -288,6 +288,7 @@ else (build_errors)
   set(sdf_version_output "cmake/${sdf_target}-config-version.cmake")
   set(sdf_config_install_dir "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME_LOWER}/")
 
+  include(CMakePackageConfigHelpers)
   #--------------------------------------
   # Configure and install the config file
   configure_package_config_file(

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -175,7 +175,7 @@ sdf_add_library(${sdf_target} ${sources})
 target_compile_features(${sdf_target} PUBLIC cxx_std_17)
 target_link_libraries(${sdf_target}
   PUBLIC
-    ${IGNITION-MATH_LIBRARIES}
+    ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER}
   PRIVATE
     ${TinyXML2_LIBRARIES})
 
@@ -185,7 +185,6 @@ endif()
 
 target_include_directories(${sdf_target}
   PUBLIC
-    ${IGNITION-MATH_INCLUDE_DIRS}
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/..>
 )