CONGE-1 Special case between windows and mac. Will have to test if it's the case on other machines

This commit is contained in:
Jimmy Tremblay-Bernier 2024-11-21 16:25:34 -05:00
parent 16364abcde
commit 0cfa8b7cea
2 changed files with 9 additions and 5 deletions

View File

@ -18,10 +18,14 @@ endif()
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build) set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build)
# Include the Conan-generated files # Include the Conan-generated files
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators")
include("${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
IF (WIN32)
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators")
include("${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake")
ELSE()
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/generators")
include("${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake")
ENDIF()
# Set common output directories # Set common output directories
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/intermediates/${CMAKE_BUILD_TYPE}/${ARCH}/${PROJECT_NAME}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/intermediates/${CMAKE_BUILD_TYPE}/${ARCH}/${PROJECT_NAME})

View File

@ -2,7 +2,7 @@
rmdir build /s /q rmdir build /s /q
@REM DEBUG @REM DEBUG
conan install . -of build -s build_type=Debug --build=missing conan install . -s build_type=Debug --build=missing
@REM RELEASE @REM RELEASE
conan install . -of build -s build_type=Release --build=missing conan install . -s build_type=Release --build=missing