@@ -23,8 +23,12 @@ macro(setup_conan)
23
23
message (WARNING "conan is not found!" )
24
24
else ()
25
25
message ("Found conan: ${V_conan_cmd} " )
26
- set (V_conan_gen_files
27
- "${CMAKE_BINARY_DIR} /build/generators/conan_toolchain.cmake" )
26
+ if (CMAKE_CONFIGURATION_TYPES ) # Multi-configuration
27
+ set (V_conan_gen_files "${CMAKE_BINARY_DIR} /build/generators/conan_toolchain.cmake" )
28
+ else () # Single-configuration
29
+ set (V_conan_gen_files "${CMAKE_BINARY_DIR} /build/${CMAKE_BUILD_TYPE} /generators/conan_toolchain.cmake" )
30
+ endif ()
31
+ message ("Conan toolchain file: ${V_conan_gen_files} " )
28
32
set (V_conanfile
29
33
"${PROJECT_SOURCE_DIR} /${GV_extra_dir} /conanfile.txt" )
30
34
if (NOT EXISTS ${V_conanfile} )
@@ -60,9 +64,9 @@ macro(setup_conan)
60
64
61
65
# Set up build type
62
66
if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
63
- set (V_conan_s_build_type "-sbuild_type =Debug" )
67
+ set (V_conan_s_build_type "-s:a" "build_type =Debug" )
64
68
else ()
65
- set (V_conan_s_build_type "-sbuild_type =Release" )
69
+ set (V_conan_s_build_type "-s:a" "build_type =Release" )
66
70
endif ()
67
71
68
72
# Prepare the conan install command
@@ -88,7 +92,9 @@ macro(setup_conan)
88
92
89
93
## Required by conan
90
94
cmake_policy (SET CMP0091 NEW)
95
+ set (CMAKE_OSX_SYSROOT_RIGHT "${CMAKE_OSX_SYSROOT} " )
91
96
include (${V_conan_gen_files} )
97
+ set (CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT_RIGHT} " CACHE PATH "Sysroot for macOS" FORCE)
92
98
endif ()
93
99
endif ()
94
100
endmacro ()
@@ -107,7 +113,7 @@ macro(setup_build_environment)
107
113
find_package (httplib REQUIRED)
108
114
find_package (nlohmann_json REQUIRED)
109
115
find_package (OpenSSL REQUIRED)
110
- find_package (Qt5 REQUIRED)
116
+ find_package (Qt6 REQUIRED)
111
117
112
118
## Setup product options
113
119
### set_product_options()
0 commit comments