-
Notifications
You must be signed in to change notification settings - Fork 5
Migrate to FetchContent for managing dependencies #34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,67 @@ | ||
| function(ct_set_compiler C_EXE CXX_EXE) | ||
| find_program(C_EXE_PATH "${C_EXE}") | ||
| find_program(CXX_EXE_PATH "${CXX_EXE}") | ||
| option(CT_HARDENED "Should the standard library be hardened" OFF) | ||
| option(CT_SANITIZED "Should the build be sanitized" OFF) | ||
|
|
||
| if(NOT C_EXE_PATH OR NOT CXX_EXE_PATH) | ||
| message(FATAL_ERROR "Could not find a requested compiler (C_EXE=${C_EXE}, CXX_EXE=${CXX_EXE})") | ||
| endif() | ||
|
|
||
| set(CMAKE_C_COMPILER "${C_EXE_PATH}") | ||
| set(CMAKE_CXX_COMPILER "${CXX_EXE_PATH}") | ||
| endfunction() | ||
| function(ct_configure_compiler) | ||
|
|
||
| function(ct_configure_compiler COMPILER_ID HARDENED SANITIZED STABLE_ABI) | ||
| set(IS_GCC OFF) | ||
| set(IS_CLANG OFF) | ||
| set(isGCC OFF) | ||
| set(isClang OFF) | ||
| set(isMSVC OFF) | ||
|
|
||
| if(COMPILER_ID STREQUAL "GNU") | ||
| set(IS_GCC ON) | ||
| elseif(COMPILER_ID MATCHES "Clang") | ||
| set(IS_CLANG ON) | ||
| if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
| set(isGCC ON) | ||
| elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||
| set(isClang ON) | ||
| elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") | ||
| set(isMSVC ON) | ||
| endif() | ||
|
|
||
| set(CT_COMPILER_FLAGS "") | ||
| set(CT_LINKER_FLAGS "") | ||
| set(compilerOptions "") | ||
| set(compilerDefinitions "") | ||
| set(linkerOptions "") | ||
|
|
||
| if(IS_CLANG AND NOT STABLE_ABI) | ||
| set(CT_COMPILER_FLAGS "${CT_COMPILER_FLAGS} -stdlib=libc++") | ||
| set(CT_LINKER_FLAGS "${CT_LINKER_FLAGS} -stdlib=libc++") | ||
| if(isClang) | ||
| list(APPEND compilerOptions -stdlib=libc++) | ||
| list(APPEND linkerOptions -stdlib=libc++) | ||
| message(STATUS "Using libc++ as a standard library") | ||
| endif() | ||
|
|
||
| if(HARDENED AND NOT STABLE_ABI) | ||
| if(IS_GCC) | ||
| set(CT_COMPILER_FLAGS "${CT_COMPILER_FLAGS} -D_GLIBCXX_DEBUG") | ||
| if(CT_HARDENED) | ||
| if(isGCC) | ||
| list(APPEND compilerDefinitions _GLIBCXX_DEBUG) | ||
| message(STATUS "Enabled debug mode for libstdc++") | ||
| elseif(IS_CLANG) | ||
| set(CT_COMPILER_FLAGS "${CT_COMPILER_FLAGS} -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG") | ||
| elseif(isClang) | ||
| list(APPEND compilerDefinitions _LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG) | ||
| message(STATUS "Enabled hardening mode for libc++") | ||
| else() | ||
| message(WARNING "Hardening is not supported for CXX compiler: '${COMPILER_ID}'") | ||
| # TODO: https://github.com/microsoft/STL/wiki/STL-Hardening | ||
| message(STATUS "Hardening is not supported for CXX compiler: '${COMPILER_ID}'") | ||
| endif() | ||
| endif() | ||
|
|
||
| if(SANITIZED) | ||
| if(IS_GCC OR IS_CLANG) | ||
| set(CT_COMPILER_FLAGS "${CT_COMPILER_FLAGS} -fsanitize=undefined,address") | ||
| set(CT_LINKER_FLAGS "${CT_LINKER_FLAGS} -fsanitize=undefined,address") | ||
| string(JOIN " " CT_COMPILER_FLAGS | ||
| "${CT_COMPILER_FLAGS}" | ||
| "-fno-sanitize-recover=all" | ||
| "-fno-optimize-sibling-calls" | ||
| "-fno-omit-frame-pointer" | ||
| if(CT_SANITIZED) | ||
| if(isGCC OR isClang) | ||
| list(APPEND compilerOptions -fsanitize=undefined,address) | ||
| list(APPEND linkerOptions -fsanitize=undefined,address) | ||
| list(APPEND compilerOptions | ||
| -fno-sanitize-recover=all | ||
| -fno-optimize-sibling-calls | ||
| -fno-omit-frame-pointer | ||
| ) | ||
| message(STATUS "Enabled UBSan and ASan") | ||
| elseif(isMSVC) | ||
| list(APPEND compilerOptions /fsanitize=address) | ||
| message(STATUS "Enabled ASan") | ||
| else() | ||
| message(WARNING "Sanitized builds are not supported for CXX compiler: '${COMPILER_ID}'") | ||
| endif() | ||
| endif() | ||
|
|
||
| message(STATUS "New compiler flags: ${CT_COMPILER_FLAGS}") | ||
| message(STATUS "New linker flags: ${CT_LINKER_FLAGS}") | ||
| message(STATUS "Setting global compiler options: ${compilerOptions}") | ||
| message(STATUS "Setting global compiler definitions: ${compilerDefinitions}") | ||
| message(STATUS "Setting global linker options: ${linkerOptions}") | ||
|
|
||
| add_compile_options(${compilerOptions}) | ||
| add_compile_definitions(${compilerDefinitions}) | ||
| add_link_options(${linkerOptions}) | ||
|
|
||
| set(CT_COMPILER_FLAGS ${CT_COMPILER_FLAGS} PARENT_SCOPE) | ||
| set(CT_LINKER_FLAGS ${CT_LINKER_FLAGS} PARENT_SCOPE) | ||
| endfunction() |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| include(FetchContent) | ||
|
|
||
| message(STATUS "Fetching Catch2...") | ||
| FetchContent_Declare( | ||
| Catch2 | ||
| URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz | ||
| FIND_PACKAGE_ARGS | ||
| ) | ||
| FetchContent_MakeAvailable(Catch2) |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.