[FOLD] adjust warnings

vinniefalco · Oct 20, 2016 · fa720d0 · fa720d0
1 parent 9eb95da
commit fa720d0
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ project (Beast)
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
 if (MSVC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /wd4131 /bigobj /D _WIN32_WINNT=0x0601 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /bigobj /D _WIN32_WINNT=0x0601 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
    #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /wd4100 /wd4131 /wd4127 /wd4244 /wd4267 /wd4334 /bigobj /D _WIN32_WINNT=0x0601 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
 else()

diff --git a/Jamroot b/Jamroot
@@ -87,17 +87,21 @@ project beast
     <library>/boost/coroutine//boost_coroutine
     <library>/boost/filesystem//boost_filesystem
     <library>/boost/program_options//boost_program_options
-    <define>BOOST_ALL_NO_LIB=1
+    #<define>BOOST_ALL_NO_LIB=1
+    #<define>BOOST_FILESYSTEM_DYN_LINK
+    #<define>BOOST_SYSTEM_STATIC_LINK
     <define>BOOST_SYSTEM_NO_DEPRECATED=1
     <threading>multi
-    <runtime-link>shared
+    <link>static
+    <runtime-link>static
     <debug-symbols>on
     <toolset>gcc:<cxxflags>-std=c++11
     <toolset>gcc:<cxxflags>-Wno-unused-variable
     <toolset>clang:<cxxflags>-std=c++11
+    <toolset>msvc:<cxxflags>-bigobj
+    <toolset>msvc:<cxxflags>-W4
     <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
     <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
-    <toolset>msvc:<cxxflags>-bigobj
     <os>LINUX:<define>_XOPEN_SOURCE=600
     <os>LINUX:<define>_GNU_SOURCE=1
     <os>SOLARIS:<define>_XOPEN_SOURCE=500

diff --git a/test/Jamfile b/test/Jamfile
@@ -87,8 +87,8 @@ compile zlib.cpp : : ;
 #    websocket/websocket_echo.cpp
 #    ;
 
-unit-test zlib-tests :
-    ../extras/beast/unit_test/main.cpp
+lib z-lib
+  :
     zlib/zlib-1.2.8/adler32.c
     zlib/zlib-1.2.8/compress.c
     zlib/zlib-1.2.8/crc32.c
@@ -100,9 +100,17 @@ unit-test zlib-tests :
     zlib/zlib-1.2.8/trees.c
     zlib/zlib-1.2.8/uncompr.c
     zlib/zlib-1.2.8/zutil.c
+  :
+    <toolset>msvc:<cxxflags>-W4
+  ;
+
+unit-test zlib-tests
+  :
+    z-lib
+    ../extras/beast/unit_test/main.cpp
     zlib/basic_deflate_stream.cpp
     zlib/basic_inflate_stream.cpp
     zlib/deflate_stream.cpp
     zlib/error.cpp
     zlib/inflate_stream.cpp
-    ;
+  ;
diff --git a/test/zlib/CMakeLists.txt b/test/zlib/CMakeLists.txt
@@ -27,6 +27,10 @@ set(ZLIB_SOURCES
     zlib-1.2.8/zutil.c
 )
 
+if (MSVC)
+    set_source_files_properties (${ZLIB_SOURCES} PROPERTIES COMPILE_FLAGS "/wd4127 /wd4131 /wd4244")
+endif()
+
 add_executable (zlib-tests
     ${BEAST_INCLUDES}
     ${EXTRAS_INCLUDES}