From d0acc4077f4984b636cd9ab02ea6e8b1424f8bdf Mon Sep 17 00:00:00 2001
From: Francois Keith <francois.keith@inrialpes.fr>
Date: Fri, 8 Apr 2011 21:09:34 +0200
Subject: [PATCH] A cleaner way to define the suffix of the dynamic libraries
according to each OS
---
tests/CMakeLists.txt | 1 +
tests/interpreter.cpp | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9268e20..349a9ac 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,6 +23,7 @@ ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
ADD_DEFINITIONS(-DTESTS_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
ADD_DEFINITIONS(-DTESTS_PLUGINDIR="${LIBRARY_OUTPUT_PATH}")
+ADD_DEFINITIONS(-DTESTS_DYNLIBSUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}")
# DYNAMIC_GRAPH_TEST(NAME)
# ------------------------
diff --git a/tests/interpreter.cpp b/tests/interpreter.cpp
index 4d457f7..f05e1ec 100644
--- a/tests/interpreter.cpp
+++ b/tests/interpreter.cpp
@@ -181,21 +181,21 @@ BOOST_AUTO_TEST_CASE (cmd_loadPlugin)
dynamicgraph::Interpreter shell (&pl);
{
- RUN_COMMAND ("loadPlugin", "shell-functions.so" " " TESTS_PLUGINDIR);
+ RUN_COMMAND ("loadPlugin", "shell-functions" TESTS_DYNLIBSUFFIX " " TESTS_PLUGINDIR);
BOOST_CHECK (output.is_empty ());
}
{
- RUN_COMMAND ("loadPlugin", "shell-procedure.so" " " TESTS_PLUGINDIR);
+ RUN_COMMAND ("loadPlugin", "shell-procedure" TESTS_DYNLIBSUFFIX " " TESTS_PLUGINDIR);
BOOST_CHECK (output.is_empty ());
}
{
- RUN_COMMAND ("unloadPlugin", TESTS_PLUGINDIR "/shell-procedure.so");
+ RUN_COMMAND ("unloadPlugin", TESTS_PLUGINDIR "/shell-procedure" TESTS_DYNLIBSUFFIX);
BOOST_CHECK (output.is_empty ());
}
{
- RUN_COMMAND ("unloadPlugin", TESTS_PLUGINDIR "/shell-functions.so");
+ RUN_COMMAND ("unloadPlugin", TESTS_PLUGINDIR "/shell-functions" TESTS_DYNLIBSUFFIX);
BOOST_CHECK (output.is_empty ());
}
--
GitLab