JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Fine tuning linking strategy

Browse Source 
static linking on Windows (MSVC and mingw) dyn linking everywhere else.
This commit is contained in:
Michael Tryby
2019-03-22 09:55:34 -04:00
parent 84341c3237
commit c9903620cb
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/CMakeLists.txt
View File

@@ -18,12 +18,12 @@ if(UNIX)
endif(UNIX)
#Prep ourselves for compiling boost
IF(MSVC)
set(Boost_DEBUG OFF)
set(Boost_DETAILED_FAILURE_MSG OFF)
IF(WIN32)
set(Boost_USE_STATIC_LIBS ON)
# add_definitions(-DBOOST_ALL_DYN_LINK)
ENDIF(MSVC)
ELSE(TRUE)
set(Boost_USE_STATIC_LIBS OFF)
add_definitions(-DBOOST_ALL_DYN_LINK)
ENDIF(WIN32)
set(Boost_THREAD_FOUND OFF)
find_package(Boost COMPONENTS unit_test_framework system thread filesystem)

9
tests/outfile/CMakeLists.txt
View File

@@ -9,10 +9,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
if (MSVC)
set (Boost_USE_STATIC_LIBS OFF)
#Prep ourselves for compiling boost
IF(WIN32)
set(Boost_USE_STATIC_LIBS ON)
ELSE(TRUE)
set(Boost_USE_STATIC_LIBS OFF)
add_definitions(-DBOOST_ALL_DYN_LINK)
endif(MSVC)
ENDIF(WIN32)
find_package(Boost COMPONENTS unit_test_framework)
include_directories (${Boost_INCLUDE_DIRS} ../../src/outfile/include)

2
tests/test_toolkit.cpp
View File

@@ -14,7 +14,7 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_MODULE toolkit
#include <boost/test/unit_test.hpp>
#include <boost/test/included/unit_test.hpp>
#include "test_toolkit.hpp"

10
tests/util/CMakeLists.txt
View File

@@ -9,11 +9,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
IF(MSVC)
set (Boost_USE_STATIC_LIBS OFF)
#Prep ourselves for compiling boost
IF(WIN32)
set(Boost_USE_STATIC_LIBS ON)
ELSE(TRUE)
set(Boost_USE_STATIC_LIBS OFF)
add_definitions(-DBOOST_ALL_DYN_LINK)
ENDIF(MSVC)
ENDIF(WIN32)
find_package(Boost COMPONENTS unit_test_framework)
include_directories (${Boost_INCLUDE_DIRS} ../../src/)