From bfdee33a56a0ebbc6b4a5577d3caf4e6e4fac58a Mon Sep 17 00:00:00 2001
From: Sander Speetjens <sander.speetjens@gmail.com>
Date: Sun, 13 Nov 2022 18:16:43 +0100
Subject: [PATCH] Add target compile options

-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
---
 CMakeLists.txt                               | 7 -------
 src/CMakeLists.txt                           | 4 +++-
 src/TopTeamBedrijfssimulaties/CMakeLists.txt | 4 +++-
 tests/CMakeLists.txt                         | 4 +++-
 tests/StartersTest.cpp                       | 6 +++---
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16ac5fd..149752c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,6 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if ( CMAKE_COMPILER_IS_GNUCC )
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall -Wextra")
-endif()
-if ( MSVC )
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} /W4")
-endif()
-
 set (VERSION_MAJOR 1)
 set (VERSION_MINOR 4)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6cb96c..37fe36b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,4 +21,6 @@ target_link_libraries(main
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
     ${PROJECT_BINARY_DIR}
-  )
\ No newline at end of file
+  )
+  
+  target_compile_options(main PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion)
\ No newline at end of file
diff --git a/src/TopTeamBedrijfssimulaties/CMakeLists.txt b/src/TopTeamBedrijfssimulaties/CMakeLists.txt
index 0a57c06..2411a6c 100644
--- a/src/TopTeamBedrijfssimulaties/CMakeLists.txt
+++ b/src/TopTeamBedrijfssimulaties/CMakeLists.txt
@@ -5,4 +5,6 @@ target_include_directories(TopTeamBedrijfssimulaties
     ${CMAKE_CURRENT_LIST_DIR}
   )
 
-add_subdirectory(Starters)
\ No newline at end of file
+add_subdirectory(Starters)
+
+target_compile_options(TopTeamBedrijfssimulaties PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion)
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c5592a3..1182a19 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,4 +12,6 @@ set(LIBS
 # tests
 file(GLOB_RECURSE TEST_SOURCES "*.cpp")
 add_executable(tests ${TEST_SOURCES})
-target_link_libraries(tests ${LIBS})
\ No newline at end of file
+target_link_libraries(tests ${LIBS})
+
+target_compile_options(tests PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion)
\ No newline at end of file
diff --git a/tests/StartersTest.cpp b/tests/StartersTest.cpp
index 44bd9b5..4c969a8 100644
--- a/tests/StartersTest.cpp
+++ b/tests/StartersTest.cpp
@@ -5,7 +5,7 @@ TEST(StartersTest, calculateStandard)
 {
     Starters_c test1(Starters_c::MachineStandard::Standard, 3, 2000, 2000, 2000, 40, 40, 6000, 45000);
     
-    EXPECT_FLOAT_EQ(-31150.0f, test1.calculate());
+    EXPECT_DOUBLE_EQ(-31150.0L, test1.calculate());
 }
 
 TEST(StartersTest, calculateLuxe)
@@ -13,6 +13,6 @@ TEST(StartersTest, calculateLuxe)
     Starters_c test1(Starters_c::MachineStandard::Luxe, 1000, 1000, 105, 25, 9000, 25000);
     Starters_c test2(Starters_c::MachineStandard::Luxe, 1000, 1000, 1000, 105, 25, 9000, 25000);
     
-    EXPECT_FLOAT_EQ(75500.0f, test1.calculate());
-    EXPECT_FLOAT_EQ(76338.0f, test2.calculate());
+    EXPECT_DOUBLE_EQ(75500.0l, test1.calculate());
+    EXPECT_DOUBLE_EQ(76337.5l, test2.calculate());
 }
\ No newline at end of file