From b629adb3e2a3fc381efb255672b07a0d82d536f0 Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Fri, 28 Jan 2011 16:54:20 +0100
Subject: [PATCH] Fix --libs output of pkg-config and link boost and python
with library.
---
CMakeLists.txt | 3 +++
src/CMakeLists.txt | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de4c491..a19ac97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,9 @@ SETUP_PROJECT()
# Trigger dependency to dynamic-graph.
ADD_REQUIRED_DEPENDENCY("dynamic-graph >= 1.0")
+# Add dependency toward dynamic graph library in pkg-config file.
+PKG_CONFIG_APPEND_LIBS("dynamic-graph-python")
+
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(doc)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db6da11..656ff56 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,9 @@ ADD_LIBRARY(${LIBRARY_NAME}
SHARED
interpreter.cc)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME}
+ ${Boost_LIBRARIES}
+ ${PYTHON_LIBRARY})
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
@@ -52,8 +55,7 @@ SET(EXECUTABLE_NAME dg-python)
ADD_EXECUTABLE(${EXECUTABLE_NAME} dg-python.cc)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
${LIBRARY_NAME}
- ${Boost_LIBRARIES}
- ${PYTHON_LIBRARY})
+ )
INSTALL(TARGETS dg-python DESTINATION bin)
#
--
GitLab