From 08aa0d3e6ee6ca8caf458cc897f712829ed54b7f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 12 Apr 2013 16:03:32 +0200
Subject: [PATCH] Replaced hardcoded boost libs with CMake variables.
---
BaseLib/CMakeLists.txt | 4 ++--
SimpleTests/MeshTests/CMakeLists.txt | 12 ++++++------
Tests/CMakeLists.txt | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index de39113bba5..4b82f184cfd 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -12,6 +12,6 @@ INCLUDE_DIRECTORIES(
)
TARGET_LINK_LIBRARIES( BaseLib
- boost_system
- boost_filesystem
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
)
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 3acfbd1fdc4..017a2dd9389 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -27,8 +27,8 @@ TARGET_LINK_LIBRARIES ( MeshRead
logog
zlib
${ADDITIONAL_LIBS}
- boost_system
- boost_filesystem
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
)
# Create CollapseMeshNodes executable
@@ -45,8 +45,8 @@ TARGET_LINK_LIBRARIES ( CollapseMeshNodes
BaseLib
GeoLib
logog
- boost_system
- boost_filesystem
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
)
# Create MeshSearchTest executable
@@ -64,6 +64,6 @@ TARGET_LINK_LIBRARIES ( MeshSearchTest
GeoLib
logog
${ADDITIONAL_LIBS}
- boost_system
- boost_filesystem
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index cc6f5558b34..7f63037318f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -41,8 +41,8 @@ TARGET_LINK_LIBRARIES(testrunner
MeshLib
OgsLib
logog
- boost_system
- boost_filesystem
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
)
--
GitLab