From 6f36ede3cfebd8c8f761a72320d4f094d7f6d803 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(B-4.4.46a)>
Date: Mon, 15 Nov 2010 13:57:10 +0100
Subject: [PATCH] Leave defaults for linking Boost libraries on non-WIN32.
WIN32 atm needs to link to static libraries for some reason.
---
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 957ae54..e0343cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,9 +41,13 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
set(LIBS "")
include_directories(${Corpus2Library_SOURCE_DIR})
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
+if(WIN32)
+# Need to work out how to properly link to boost DLLs on Windows
+# For now, just link to static boost libs to make it work
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_MULTITHREADED ON)
+ set(Boost_USE_STATIC_RUNTIME OFF)
+endif(WIN32)
find_package(Boost 1.41 REQUIRED COMPONENTS program_options filesystem regex)
set(LIBCORPUS2_INSTALL_DATA_DIR share/corpus2)
--
GitLab