Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions cmake/Includes.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,23 @@ if (BUILD_TESTING)
)

target_include_directories (
${PROJECT_NAME}_TestSuite_test PRIVATE
${PROJECT_NAME}_TestSuite_ctor_test PRIVATE
test/include
include
)
target_include_directories (
${PROJECT_NAME}_TestSuite_running_test PRIVATE
test/include
include
)
target_include_directories (
${PROJECT_NAME}_TestSuite_tpm_test PRIVATE
test/include
include
)

target_include_directories (
${PROJECT_NAME}_Assertions_test PRIVATE
${PROJECT_NAME}_Assertions_basic_test PRIVATE
test/include
include
)
Expand Down
24 changes: 18 additions & 6 deletions cmake/Targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,27 @@ if (BUILD_TESTING)
)

add_executable (
${PROJECT_NAME}_TestSuite_test
test/src/TestSuite/TestSuiteTests.cpp
test/src/TestCPPTestSuiteMain.cpp
${PROJECT_NAME}_TestSuite_ctor_test
test/src/TestSuite/TestSuiteConstructionTests.cpp
test/src/TestCPPTestSuiteConstructionMain.cpp
)

add_executable (
${PROJECT_NAME}_Assertions_test
test/src/Assertions/BasicAssertionsTests.cpp
test/src/TestCPPAssertionsMain.cpp
${PROJECT_NAME}_TestSuite_running_test
test/src/TestSuite/TestSuiteRunningTests.cpp
test/src/TestCPPTestSuiteRunningMain.cpp
)

add_executable (
${PROJECT_NAME}_TestSuite_tpm_test
test/src/TestSuite/TestSuiteTestPassedMessageTests.cpp
test/src/TestCPPTestSuiteTestPassedMessageMain.cpp
)

add_executable (
${PROJECT_NAME}_Assertions_basic_test
test/src/Assertions/AssertionsBasicTests.cpp
test/src/TestCPPAssertionsBasicMain.cpp
)

add_executable (
Expand Down
16 changes: 12 additions & 4 deletions cmake/Testing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ if (BUILD_TESTING)
)

add_test (
NAME ${PROJECT_NAME}TestSuiteTests
COMMAND ${PROJECT_NAME}_TestSuite_test
NAME ${PROJECT_NAME}TestSuiteConstructionTests
COMMAND ${PROJECT_NAME}_TestSuite_ctor_test
)
add_test (
NAME ${PROJECT_NAME}TestSuiteRunningTests
COMMAND ${PROJECT_NAME}_TestSuite_running_test
)
add_test (
NAME ${PROJECT_NAME}TestSuiteTestPassedMessageTests
COMMAND ${PROJECT_NAME}_TestSuite_tpm_test
)

add_test (
NAME ${PROJECT_NAME}AssertionsTests
COMMAND ${PROJECT_NAME}_Assertions_test
NAME ${PROJECT_NAME}AssertionsBasicTests
COMMAND ${PROJECT_NAME}_Assertions_basic_test
)

add_test (
Expand Down
14 changes: 12 additions & 2 deletions cmake/build/DebugCompileDefs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,22 @@ if (BUILD_TESTING)
DEBUG_LOG
)
target_compile_definitions (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
PUBLIC
DEBUG_LOG
)
target_compile_definitions (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_TestSuite_running_test
PUBLIC
DEBUG_LOG
)
target_compile_definitions (
${PROJECT_NAME}_TestSuite_tpm_test
PUBLIC
DEBUG_LOG
)
target_compile_definitions (
${PROJECT_NAME}_Assertions_basic_test
PUBLIC
DEBUG_LOG
)
Expand Down
18 changes: 16 additions & 2 deletions cmake/build/GCCClangDebug.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ list (
# it's not necessary to maintain
# compatibility with C++98.
-Wno-covered-switch-default # -Wswitch-default is more important.
-Wno-unknown-pragmas # Ignore unknown pragmas, since we are
# building for Clang, GCC, and MSVC,
# and MSVC has different pragmas than
# GCC/Clang.
-Wno-unused-lambda-capture # Avoid MSVC error C3493 - There is
# implementation divergence here and
# since we're not using >=C++14 there
Expand Down Expand Up @@ -93,13 +97,23 @@ else ()
)

target_compile_options (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
PUBLIC
${GCC_CLANG_DEBUG_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_running_test
PUBLIC
${GCC_CLANG_DEBUG_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_tpm_test
PUBLIC
${GCC_CLANG_DEBUG_BUILD_OPTS}
)

target_compile_options (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
PUBLIC
${GCC_CLANG_DEBUG_BUILD_OPTS}
)
Expand Down
18 changes: 16 additions & 2 deletions cmake/build/GCCClangRelease.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ list (
# it's not necessary to maintain
# compatibility with C++98.
-Wno-covered-switch-default # -Wswitch-default is more important.
-Wno-unknown-pragmas # Ignore unknown pragmas, since we are
# building for Clang, GCC, and MSVC,
# and MSVC has different pragmas than
# GCC/Clang.
-Wno-unused-parameter # Unused parameters occur in the Release
# build in debugLog.
-Wno-unused-lambda-capture # Avoid MSVC error C3493 - There is
Expand Down Expand Up @@ -86,13 +90,23 @@ if (BUILD_TESTING)
)

target_compile_options (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
PUBLIC
${GCC_CLANG_RELEASE_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_running_test
PUBLIC
${GCC_CLANG_RELEASE_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_tpm_test
PUBLIC
${GCC_CLANG_RELEASE_BUILD_OPTS}
)

target_compile_options (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
PUBLIC
${GCC_CLANG_RELEASE_BUILD_OPTS}
)
Expand Down
18 changes: 16 additions & 2 deletions cmake/build/GCCCoverage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ list (
# it's not necessary to maintain
# compatibility with C++98.
-Wno-covered-switch-default # -Wswitch-default is more important.
-Wno-unknown-pragmas # Ignore unknown pragmas, since we are
# building for Clang, GCC, and MSVC,
# and MSVC has different pragmas than
# GCC/Clang.
-fprofile-arcs # Enable profile points that help with
# code coverage.
-ftest-coverage # Enable core code coverage compilation.
Expand All @@ -39,13 +43,23 @@ target_compile_options (
)

target_compile_options (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
PUBLIC
${COVERAGE_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_running_test
PUBLIC
${COVERAGE_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_tpm_test
PUBLIC
${COVERAGE_BUILD_OPTS}
)

target_compile_options (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
PUBLIC
${COVERAGE_BUILD_OPTS}
)
Expand Down
14 changes: 12 additions & 2 deletions cmake/build/MSVCDebug.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,23 @@ if (BUILD_TESTING)
)

target_compile_options (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
PUBLIC
${MSVC_DEBUG_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_running_test
PUBLIC
${MSVC_DEBUG_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_tpm_test
PUBLIC
${MSVC_DEBUG_BUILD_OPTS}
)

target_compile_options (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
PUBLIC
${MSVC_DEBUG_BUILD_OPTS}
)
Expand Down
14 changes: 12 additions & 2 deletions cmake/build/MSVCRelease.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,23 @@ if (BUILD_TESTING)
)

target_compile_options (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
PUBLIC
${MSVC_RELEASE_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_running_test
PUBLIC
${MSVC_RELEASE_BUILD_OPTS}
)
target_compile_options (
${PROJECT_NAME}_TestSuite_tpm_test
PUBLIC
${MSVC_RELEASE_BUILD_OPTS}
)

target_compile_options (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
PUBLIC
${MSVC_RELEASE_BUILD_OPTS}
)
Expand Down
42 changes: 36 additions & 6 deletions cmake/link/Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,25 @@ if (${TESTCPP_STACKTRACE_ENABLED} AND MSVC)
dbgeng
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
${PROJECT_NAME}
ole32
dbgeng
)
target_link_libraries (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_TestSuite_running_test
${PROJECT_NAME}
ole32
dbgeng
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_tpm_test
${PROJECT_NAME}
ole32
dbgeng
)
target_link_libraries (
${PROJECT_NAME}_Assertions_basic_test
${PROJECT_NAME}
ole32
dbgeng
Expand All @@ -31,12 +43,22 @@ elseif (${TESTCPP_STACKTRACE_ENABLED})
dl
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
${PROJECT_NAME}
dl
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_running_test
${PROJECT_NAME}
dl
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_tpm_test
${PROJECT_NAME}
dl
)
target_link_libraries (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
${PROJECT_NAME}
dl
)
Expand All @@ -52,11 +74,19 @@ else ()
${PROJECT_NAME}
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_test
${PROJECT_NAME}_TestSuite_ctor_test
${PROJECT_NAME}
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_running_test
${PROJECT_NAME}
)
target_link_libraries (
${PROJECT_NAME}_TestSuite_tpm_test
${PROJECT_NAME}
)
target_link_libraries (
${PROJECT_NAME}_Assertions_test
${PROJECT_NAME}_Assertions_basic_test
${PROJECT_NAME}
)
target_link_libraries (
Expand Down
Loading