From c9903620cbbe246c8371b3beb1af4a4dc938d0a5 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 22 Mar 2019 09:55:34 -0400
Subject: [PATCH] Fine tuning linking strategy

static linking on Windows (MSVC and mingw) dyn linking everywhere else.
---
 tests/CMakeLists.txt         | 10 +++++-----
 tests/outfile/CMakeLists.txt |  9 ++++++---
 tests/test_toolkit.cpp       |  2 +-
 tests/util/CMakeLists.txt    | 10 ++++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8853b0e..b91c02f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -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)
diff --git a/tests/outfile/CMakeLists.txt b/tests/outfile/CMakeLists.txt
index b14bb84..84e00a4 100644
--- a/tests/outfile/CMakeLists.txt
+++ b/tests/outfile/CMakeLists.txt
@@ -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)
diff --git a/tests/test_toolkit.cpp b/tests/test_toolkit.cpp
index f4c760b..70718f1 100644
--- a/tests/test_toolkit.cpp
+++ b/tests/test_toolkit.cpp
@@ -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"
 
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 2c380ff..27f33c8 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -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/)