From 4179c0fdcc67b97ba882bac846f29b3e794d011d Mon Sep 17 00:00:00 2001 From: Thomas Moulard <thomas.moulard@gmail.com> Date: Tue, 9 Nov 2010 10:21:00 +0100 Subject: [PATCH] Use PKG_CONFIG_USE_DEPENDENCY new macro to import dependency flags properly. --- cmake | 2 +- src/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake b/cmake index 1e8ceff5..432b255f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 1e8ceff5396490032f0fbbc78afaa00bc48baa0f +Subproject commit 432b255fc48d26a36bbd8c9d329d4e45c438613c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1dae8ef7..36667ac5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,9 +13,6 @@ # received a copy of the GNU Lesser General Public License along with # jrl-walkgen. If not, see <http://www.gnu.org/licenses/>. -# Import jrl-mal flags. -INCLUDE_DIRECTORIES(${JRL_MAL_INCLUDEDIR}) - # Make sure to find Debug.h INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/src) @@ -69,6 +66,7 @@ SET(SOURCES ) ADD_LIBRARY(jrl-walkgen SHARED ${SOURCES}) -TARGET_LINK_LIBRARIES(jrl-walkgen ${LAPACK_LIBRARIES}) SET_TARGET_PROPERTIES(jrl-walkgen PROPERTIES SOVERSION ${PROJECT_VERSION}) INSTALL(TARGETS jrl-walkgen DESTINATION lib) + +PKG_CONFIG_USE_DEPENDENCY(jrl-walkgen jrl-mal) -- GitLab