From f7144cb9cb20507e9ea60eb4810b40f7d861edaa Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Tue, 19 Nov 2019 16:41:24 +0100
Subject: [PATCH] Add pkg-config flags to cmake exported targets
---
CMakeLists.txt | 4 ++++
src/CMakeLists.txt | 1 -
test/CMakeLists.txt | 6 +++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1176c987..04667dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,10 @@ set(PROJECT_DESCRIPTION
)
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
+# Do not support CMake older than 2.8.12
+CMAKE_POLICY(SET CMP0022 NEW)
+SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE)
+
include(cmake/eigen.cmake)
include(cmake/boost.cmake)
include(cmake/python.cmake)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5e534ce..cbf9dd39 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -93,7 +93,6 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
target_include_directories(${LIBRARY_NAME} SYSTEM PUBLIC
${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
- $<$<BOOL:${HPP_FCL_HAVE_OCTOMAP}>:${OCTOMAP_INCLUDE_DIRS}>
)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} assimp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a3d487da..b9308e3b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -21,7 +21,11 @@ endmacro(add_fcl_test)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_library(utility STATIC utility.cpp)
+IF(RUN_TESTS)
+ add_library(utility STATIC utility.cpp)
+ELSE()
+ add_library(utility STATIC EXCLUDE_FROM_ALL utility.cpp)
+ENDIF()
target_link_libraries(utility hpp-fcl)
add_fcl_test(math math.cpp)
--
GitLab