des/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Try VCPKG_CHAINLOAD_TOOLCHAIN_FILE again

Browse source
This commit is contained in:
Patricia Aas 2021-08-02 15:46:49 +02:00
parent 76c931656f
commit abaa4f6381
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.17) cmake_minimum_required(VERSION 3.17)
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchain.cmake")
find_package(Git QUIET) find_package(Git QUIET)
if (GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") if (GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
# Update submodules as needed # Update submodules as needed
@ -26,8 +28,6 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/
enable_language(CXX) enable_language(CXX)
project(pacman) project(pacman)
include(cmake/toolchain.cmake)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
add_subdirectory(scaling-lib) add_subdirectory(scaling-lib)

6
cmake/toolchain.cmake
View file

@ -1,12 +1,12 @@
#compile with warnings #compile with warnings
if(MSVC) if(WIN32)
add_compile_options(/W4 /WX) add_compile_options(/W4 /WX)
else() else()
add_compile_options(-Wall -Wextra -pedantic -Werror) add_compile_options(-Wall -Wextra -pedantic -Werror)
endif() endif()
#enable asan in debug #enable asan in debug
if(MSVC) if(WIN32)
add_compile_options("$<$<CONFIG:DEBUG>:-fsanitize=address>") add_compile_options("$<$<CONFIG:DEBUG>:-fsanitize=address>")
else() else()
add_compile_options("$<$<CONFIG:DEBUG>:-fsanitize=address>") add_compile_options("$<$<CONFIG:DEBUG>:-fsanitize=address>")
@ -14,7 +14,7 @@ else()
endif() endif()
#enable ubsan in debug #enable ubsan in debug
if(NOT MSVC) if(NOT WIN32)
add_compile_options("$<$<CONFIG:DEBUG>:-fsanitize=undefined>" add_compile_options("$<$<CONFIG:DEBUG>:-fsanitize=undefined>"
"$<$<CONFIG:DEBUG>:-fno-omit-frame-pointer>") "$<$<CONFIG:DEBUG>:-fno-omit-frame-pointer>")
add_link_options("$<$<CONFIG:DEBUG>:-fsanitize=undefined>") add_link_options("$<$<CONFIG:DEBUG>:-fsanitize=undefined>")