From 16364abcde449f4168e23f58fe09d8901b078bd6 Mon Sep 17 00:00:00 2001 From: Jimmy Tremblay-Bernier Date: Thu, 21 Nov 2024 16:18:15 -0500 Subject: [PATCH] CONGE-1 This work in mac --- CMakeLists.txt | 4 ++-- Configure.bat | 6 ++---- Configure.sh | 0 3 files changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 Configure.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 2507bb6..6bc9f3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,9 @@ endif() set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build) # Include the Conan-generated files -list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/generators") +list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators") -include("${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake") +include("${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake") # Set common output directories diff --git a/Configure.bat b/Configure.bat index b35b3d4..95abdad 100644 --- a/Configure.bat +++ b/Configure.bat @@ -1,10 +1,8 @@ @REM Run Conan to install dependencies rmdir build /s /q -mkdir build - @REM DEBUG -conan install . -s build_type=Debug --build=missing +conan install . -of build -s build_type=Debug --build=missing @REM RELEASE -conan install . -s build_type=Release --build=missing +conan install . -of build -s build_type=Release --build=missing diff --git a/Configure.sh b/Configure.sh old mode 100644 new mode 100755