Skip to content

Commit cac9464

Browse files
committed
fix the windows build again
1 parent 7fcda88 commit cac9464

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,22 @@ include_directories(
3636
# Conan 2.0 generates CMakeDeps and CMakeToolchain via conan install
3737
if(USE_CONAN)
3838
# Try multiple possible locations for the toolchain
39-
# Conan 2.0 with cmake_layout generates in build/<build_type>/generators/
39+
# Conan 2.0 with cmake_layout generates in build/build/generators/ (Visual Studio multi-config)
40+
# or build/build/<build_type>/generators/ (single-config generators)
4041
set(CONAN_TOOLCHAIN_PATHS
4142
"${CMAKE_BINARY_DIR}/conan_toolchain.cmake"
4243
"${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake"
44+
"${CMAKE_BINARY_DIR}/build/generators/conan_toolchain.cmake"
45+
"${CMAKE_BINARY_DIR}/build/build/generators/conan_toolchain.cmake"
4346
"${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake"
4447
"${CMAKE_BINARY_DIR}/build/Release/generators/conan_toolchain.cmake"
4548
"${CMAKE_BINARY_DIR}/build/Debug/generators/conan_toolchain.cmake"
49+
"${CMAKE_BINARY_DIR}/build/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake"
50+
"${CMAKE_BINARY_DIR}/build/build/Release/generators/conan_toolchain.cmake"
51+
"${CMAKE_BINARY_DIR}/build/build/Debug/generators/conan_toolchain.cmake"
4652
"${CMAKE_SOURCE_DIR}/build/conan_toolchain.cmake"
4753
"${CMAKE_SOURCE_DIR}/build/generators/conan_toolchain.cmake"
54+
"${CMAKE_SOURCE_DIR}/build/build/generators/conan_toolchain.cmake"
4855
"${CMAKE_SOURCE_DIR}/build/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake"
4956
"${CMAKE_SOURCE_DIR}/build/build/Release/generators/conan_toolchain.cmake"
5057
)
@@ -72,11 +79,17 @@ if(USE_CONAN)
7279
else()
7380
# Set CMAKE_PREFIX_PATH to help find_package find Conan packages
7481
# Try multiple possible generator locations
82+
# For Visual Studio multi-config: build/build/generators/
83+
# For single-config: build/build/<build_type>/generators/ or build/generators/
7584
set(GENERATORS_DIR "")
76-
if(EXISTS "${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/generators")
85+
if(EXISTS "${CMAKE_BINARY_DIR}/build/build/generators")
86+
set(GENERATORS_DIR "${CMAKE_BINARY_DIR}/build/build/generators")
87+
elseif(EXISTS "${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/generators")
7788
set(GENERATORS_DIR "${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/generators")
7889
elseif(EXISTS "${CMAKE_BINARY_DIR}/build/Release/generators")
7990
set(GENERATORS_DIR "${CMAKE_BINARY_DIR}/build/Release/generators")
91+
elseif(EXISTS "${CMAKE_BINARY_DIR}/build/build/Release/generators")
92+
set(GENERATORS_DIR "${CMAKE_BINARY_DIR}/build/build/Release/generators")
8093
elseif(EXISTS "${CMAKE_BINARY_DIR}/generators")
8194
set(GENERATORS_DIR "${CMAKE_BINARY_DIR}/generators")
8295
endif()

0 commit comments

Comments
 (0)