Windows build configuration

test/CMakeLists.txt

@@ -1,42 +1,71 @@
-find_package(Boost COMPONENTS unit_test_framework date_time filesystem system thread REQUIRED)
+set(BOOST_LIBS unit_test_framework date_time filesystem system thread)
+if(WIN32)
+    list(APPEND BOOST_LIBS regex chrono)
+endif()
+
+find_package(Boost COMPONENTS ${BOOST_LIBS} REQUIRED)
 find_package(Threads)
 include_directories(
     ${TEST_SOURCE_DIR/src}
-    ${Boost_INLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
 )
-add_definitions(-DBOOST_TEST_DYN_LINK)
+#add_definitions(-DBOOST_TEST_DYN_LINK)
 
 add_executable(SyslogBulkUploaderTests SyslogBulkUploaderTests.cpp)
 target_link_libraries(SyslogBulkUploaderTests
-	slbu-lib
-	${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+        slbu-lib
+        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
         ${Boost_DATE_TIME_LIBRARY}
         ${Boost_FILESYSTEM_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}
         ${CMAKE_THREAD_LIBS_INIT}
         ${Boost_THREAD_LIBRARY}
 )
+if(WIN32)
+    target_link_libraries(SyslogBulkUploaderTests
+        ${Boost_REGEX_LIBRARY}
+        ${Boost_CHRONO_LIBRARY}
+    )
+endif()
 
 add_executable(SyslogMessageTests SyslogMessageTests.cpp)
 target_link_libraries(SyslogMessageTests
-	slbu-lib
-	${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+        slbu-lib
+        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
         ${Boost_DATE_TIME_LIBRARY}
 )
+if(WIN32)
+    target_link_libraries(SyslogMessageTests
+        ${Boost_REGEX_LIBRARY}
+        ${Boost_CHRONO_LIBRARY}
+    )
+endif()
 
 add_executable(RFC3164FormattedSyslogMessageTests RFC3164FormattedSyslogMessageTests.cpp)
 target_link_libraries(RFC3164FormattedSyslogMessageTests
-	slbu-lib
-	${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+        slbu-lib
+        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
         ${Boost_DATE_TIME_LIBRARY}
 )
+if(WIN32)
+    target_link_libraries(RFC3164FormattedSyslogMessageTests
+        ${Boost_REGEX_LIBRARY}
+        ${Boost_CHRONO_LIBRARY}
+    )
+endif()
 
 add_executable(FrequencyLimitTests FrequencyLimitTests.cpp)
 target_link_libraries(FrequencyLimitTests
-	slbu-lib
-	${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+        slbu-lib
+        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
         ${Boost_DATE_TIME_LIBRARY}
         ${Boost_THREAD_LIBRARY}
         ${Boost_SYSTEM_LIBRARY}
 )
+if(WIN32)
+    target_link_libraries(FrequencyLimitTests
+        ${Boost_REGEX_LIBRARY}
+        ${Boost_CHRONO_LIBRARY}
+    )
+endif()
 

test/FrequencyLimitTests.cpp

@@ -42,10 +42,10 @@ size_t countInLoop(size_t freq, time_duration duration) {
 
 BOOST_AUTO_TEST_CASE(test_slow) {
     size_t c = countInLoop(5, seconds(5));
-    BOOST_WARN_CLOSE((float) c, 25, 10);
+    BOOST_WARN_CLOSE((float) c, 25., 10.);
 }
 
 BOOST_AUTO_TEST_CASE(test_fast) {
     size_t c = countInLoop(100, seconds(5));
-    BOOST_WARN_CLOSE((float) c, 500, 10);
+    BOOST_WARN_CLOSE((float) c, 500., 10.);
 }

test/SyslogBulkUploaderTests.cpp

@@ -22,6 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
+#define BOOST_TEST_MODULE SyslogBulkUploaderTests
+#include <boost/test/unit_test.hpp>
+#include <memory>
+#define BOOST_FILESYSTEM_NO_DEPRECATED
+#include <boost/filesystem.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 #include "../src/SyslogBulkUploader.h"
 #include "../src/Reader.h"
 #include "../src/Writer.h"
@@ -29,12 +36,6 @@ SOFTWARE.
 #include "../src/UDPWriter.h"
 #include "UdpSyslogServer.h"
 #include "../src/RFC3164FormattedSyslogMessage.h"
-#define BOOST_TEST_MODULE SyslogBulkUploaderTests
-#include <boost/test/unit_test.hpp>
-#include <memory>
-#define BOOST_FILESYSTEM_NO_DEPRECATED
-#include <boost/filesystem.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 
 class MockReader : public Reader {
 public: