diff options
| author | ladevieq <ladevie.quentin@gmail.com> | 2021-02-14 10:49:46 +0100 |
|---|---|---|
| committer | ladevieq <ladevie.quentin@gmail.com> | 2021-02-14 10:49:46 +0100 |
| commit | d957649226fa0f566854823702457c41f737d92b (patch) | |
| tree | 395a6357c00e82fa39d630a18bdee02c951a2c84 | |
| parent | c766fda8c5f0c72ca58ab745b7323347f8d63867 (diff) | |
Fix vcpkg toolchain file issues
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a90f9c..8127409 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,11 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file") -set(VCPKG_TARGET_TRIPLET "x64-windows") +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") project(path-tracer VERSION 1.0 LANGUAGES CXX) +find_package(imgui CONFIG REQUIRED) find_package(Vulkan REQUIRED) if(UNIX) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 04a57a3..cc03d6b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,5 @@ add_definitions(-DNOMINMAX -D_USE_MATH_DEFINES) -# VCPKG includes -include_directories(./vcpkg/installed/$ENV{VCPKG_TARGET_TRIPLET}/include) - include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${Vulkan_INCLUDE_DIRS}) @@ -25,9 +22,6 @@ add_executable( window.cpp ) -# VCPKG libs -link_directories(./vcpkg/installed/$ENV{VCPKG_TARGET_TRIPLET}/lib) - if(UNIX) target_link_libraries(path-tracer ${CMAKE_DL_LIBS} ${X11_xcb_LIB}) target_link_libraries(path-tracer ${CMAKE_DL_LIBS} ${X11_xkbcommon_LIB}) |