3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-25 23:06:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove file list checking from CMake

Browse Source 
I do not think we need a safeguard against not including files in
CMake anymore, and as it is, it caused annoying false positive about
the default main implementation.
This commit is contained in:
Martin Hořeňovský 2020-05-06 21:23:10 +02:00
parent 9766a7b200
commit e78b4f6be7
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMake/MiscFunctions.cmake
View File

@ -1,30 +1,3 @@
#checks that the given hard-coded list contains all headers + sources in the given folder
function(CheckFileList LIST_VAR FOLDER)
set(MESSAGE " should be added to the variable ${LIST_VAR}")
set(MESSAGE "${MESSAGE} in ${CMAKE_CURRENT_LIST_FILE}\n")
file(GLOB GLOBBED_LIST "${FOLDER}/*.cpp"
"${FOLDER}/*.hpp"
"${FOLDER}/*.h")
list(REMOVE_ITEM GLOBBED_LIST ${${LIST_VAR}})
foreach(EXTRA_ITEM ${GLOBBED_LIST})
string(REPLACE "${CATCH_DIR}/" "" RELATIVE_FILE_NAME "${EXTRA_ITEM}")
message(AUTHOR_WARNING "The file \"${RELATIVE_FILE_NAME}\"${MESSAGE}")
endforeach()
endfunction()
function(CheckFileListRec LIST_VAR FOLDER)
set(MESSAGE " should be added to the variable ${LIST_VAR}")
set(MESSAGE "${MESSAGE} in ${CMAKE_CURRENT_LIST_FILE}\n")
file(GLOB_RECURSE GLOBBED_LIST "${FOLDER}/*.cpp"
"${FOLDER}/*.hpp"
"${FOLDER}/*.h")
list(REMOVE_ITEM GLOBBED_LIST ${${LIST_VAR}})
foreach(EXTRA_ITEM ${GLOBBED_LIST})
string(REPLACE "${CATCH_DIR}/" "" RELATIVE_FILE_NAME "${EXTRA_ITEM}")
message(AUTHOR_WARNING "The file \"${RELATIVE_FILE_NAME}\"${MESSAGE}")
endforeach()
endfunction()
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
function(add_cxx_flag_if_supported_to_targets flagname targets) function(add_cxx_flag_if_supported_to_targets flagname targets)
check_cxx_compiler_flag("${flagname}" HAVE_FLAG_${flagname}) check_cxx_compiler_flag("${flagname}" HAVE_FLAG_${flagname})

2
src/CMakeLists.txt
View File

@ -199,7 +199,6 @@ set(IMPL_SOURCES
${SOURCES_DIR}/internal/catch_xmlwriter.cpp ${SOURCES_DIR}/internal/catch_xmlwriter.cpp
) )
set(INTERNAL_FILES ${IMPL_SOURCES} ${INTERNAL_HEADERS}) set(INTERNAL_FILES ${IMPL_SOURCES} ${INTERNAL_HEADERS})
CheckFileList(INTERNAL_FILES ${SOURCES_DIR}/internal)
# Please keep these ordered alphabetically # Please keep these ordered alphabetically
set(REPORTER_HEADERS set(REPORTER_HEADERS
@ -228,7 +227,6 @@ set(REPORTER_SOURCES
${SOURCES_DIR}/reporters/catch_reporter_xml.cpp ${SOURCES_DIR}/reporters/catch_reporter_xml.cpp
) )
set(REPORTER_FILES ${REPORTER_HEADERS} ${REPORTER_SOURCES}) set(REPORTER_FILES ${REPORTER_HEADERS} ${REPORTER_SOURCES})
CheckFileList(REPORTER_FILES ${SOURCES_DIR}/reporters)
# Fixme: STATIC because for dynamic, we would need to handle visibility # Fixme: STATIC because for dynamic, we would need to handle visibility
# and I don't want to do the annotations right now # and I don't want to do the annotations right now

1
tests/CMakeLists.txt
View File

@ -53,7 +53,6 @@ set(TEST_SOURCES
${SELF_TEST_DIR}/UsageTests/MatchersRanges.tests.cpp ${SELF_TEST_DIR}/UsageTests/MatchersRanges.tests.cpp
${SELF_TEST_DIR}/UsageTests/Matchers.tests.cpp ${SELF_TEST_DIR}/UsageTests/Matchers.tests.cpp
) )
CheckFileList(TEST_SOURCES ${SELF_TEST_DIR})
# Specify the headers, too, so CLion recognises them as project files # Specify the headers, too, so CLion recognises them as project files