From 35338716c430e17684cf5fb9ea4d0d301ea23e9c Mon Sep 17 00:00:00 2001 From: Daniel Playfair Cal Date: Fri, 12 Mar 2021 10:28:26 +1100 Subject: [PATCH 1/3] update jrl-cmakemodules --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 811bfc4..7e797cb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 811bfc472940425a0a96cca7e01331f6cf68fced +Subproject commit 7e797cbcae0947acce802c0bc63765a2b7c75828 From 6c4a34a3146b1c6ea06078758485eabea235ea0f Mon Sep 17 00:00:00 2001 From: Daniel Playfair Cal Date: Fri, 12 Mar 2021 10:37:00 +1100 Subject: [PATCH 2/3] fix cflags and ldflags in generated pkgconfig file --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d796bcd..a1a0f3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ if(MSVC) endif() -add_project_dependency(Eigen3 REQUIRED) +add_project_dependency(Eigen3 REQUIRED PKG_CONFIG_REQUIRES eigen3) add_project_dependency(Boost REQUIRED) add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 907273f..2b1d186 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,6 +26,8 @@ else() target_link_libraries(gram_savitzky_golay PUBLIC ${BOOST_LIBRARIES}) endif() +pkg_config_append_libs(gram_savitzky_golay) + set_target_properties(gram_savitzky_golay PROPERTIES SOVERSION ${PROJECT_VERSION}) install(TARGETS gram_savitzky_golay From 7147138096e579e95724a7bd46bdd6a109cc422c Mon Sep 17 00:00:00 2001 From: Arnaud TANGUY Date: Mon, 15 Mar 2021 19:21:06 +0900 Subject: [PATCH 3/3] [cmake] Update cmake submodule --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 7e797cb..f4997a8 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 7e797cbcae0947acce802c0bc63765a2b7c75828 +Subproject commit f4997a81cebfa2dfb69733bc088c55688965dfe8