sani7/TopTeamBedrijfssimulaties-Starters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add target compile options

Browse Source 
-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
This commit is contained in:
Sander Speetjens
2022-11-13 18:16:43 +01:00
parent 992a37d514
commit bfdee33a56
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -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)

4
src/CMakeLists.txt
View File

@@ -21,4 +21,6 @@ target_link_libraries(main
${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/TopTeamBedrijfssimulaties
${PROJECT_BINARY_DIR}
)
)
target_compile_options(main PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion)

4
src/TopTeamBedrijfssimulaties/CMakeLists.txt
View File

@@ -5,4 +5,6 @@ target_include_directories(TopTeamBedrijfssimulaties
${CMAKE_CURRENT_LIST_DIR}
)
add_subdirectory(Starters)
add_subdirectory(Starters)
target_compile_options(TopTeamBedrijfssimulaties PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion)

4
tests/CMakeLists.txt
View File

@@ -12,4 +12,6 @@ set(LIBS
# tests
file(GLOB_RECURSE TEST_SOURCES "*.cpp")
add_executable(tests ${TEST_SOURCES})
target_link_libraries(tests ${LIBS})
target_link_libraries(tests ${LIBS})
target_compile_options(tests PRIVATE -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion)

6
tests/StartersTest.cpp
View File

@@ -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());
}