Insert os specific warnings

Author: florianbecker

cmake/clang_warnings.cmake

@@ -30,11 +30,6 @@
 
 set(WARNING_FLAGS
 
-  # From Xcode default project
-#  -Wno-sign-conversion
-#  -Wno-exit-time-destructors
-#  -Wno-conversion
-
   # Own parameter
   -Wno-c++98-compat # C++11
   -Wno-c++98-compat-pedantic # C++11

cmake/env.cmake

@@ -70,6 +70,13 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_SPACED}")
 
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+  include(${CMAKE}/msvc_warnings.cmake)
+
+  set(WARNING_FLAGS_SPACED "")
+  foreach(WARNING_FLAG ${WARNING_FLAGS})
+    set(WARNING_FLAGS_SPACED "${WARNING_FLAGS_SPACED} ${WARNING_FLAG}")
+  endforeach()
+
   # Force to always compile with W4
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX")
   if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")

cmake/gcc_warnings.cmake

@@ -29,6 +29,4 @@
 #
 
 set(WARNING_FLAGS
-
-#  -Wno-unknown-pragmas
 )

cmake/msvc_warnings.cmake

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2020 Florian Becker <[email protected]> (VX APPS).
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+set(WARNING_FLAGS
+)

source/CMakeLists.txt

@@ -30,6 +30,10 @@
 
 project(modern.cpp.core)
 
+if(UNIX)
+  set(${PROJECT_NAME}_os_src unixservice/main.cpp)
+endif()
+
 add_library(${PROJECT_NAME}
   ../README.md
   CPU.cpp
@@ -48,7 +52,7 @@ add_library(${PROJECT_NAME}
   Timing.h
   templates/CSVWriter.h
   templates/Timer.h
-  unixservice/main.cpp
+  ${${PROJECT_NAME}_os_src}
 )
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/templates)

source/KeyState.cpp

@@ -30,7 +30,7 @@
 
 #ifdef _WIN32
   #include <Windows.h>
-#elif defined(__APPLE__)
+#elif __APPLE__
   #include <Carbon/Carbon.h>
 #endif