From ea1cd376cb4180df507100b67983e5bd5cc21eaa Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Sun, 4 Mar 2012 15:51:05 +0100
Subject: [PATCH] Fix build for binutils > 2.22
Patch reported by Anthony Mallet.
---
src/CMakeLists.txt | 1 +
tests/CMakeLists.txt | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb11a31a..ac8e45d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,6 +57,7 @@ IF (UNIX)
ENDIF (UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${JRL_MAL_LDFLAGS_OTHER})
INSTALL(TARGETS ${LIBRARY_NAME}
DESTINATION lib)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e5f4a1ff..aa07ef22 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,7 +44,9 @@ MACRO(DYNAMIC_GRAPH_TEST NAME)
TARGET_LINK_LIBRARIES(${NAME} ${Boost_LIBRARIES})
# Search for jrl-mal.
- PKG_CONFIG_USE_DEPENDENCY(${NAME} jrl-mal)
+ INCLUDE_DIRECTORIES(${JRL_MAL_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${JRL_MAL_LIBRARY_DIRS})
+ TARGET_LINK_LIBRARIES(${NAME} ${JRL_MAL_LDFLAGS})
ENDMACRO(DYNAMIC_GRAPH_TEST)
--
GitLab