diff --git a/setup-debug.bat b/setup-debug.bat index 74100c83..f082a0cc 100644 --- a/setup-debug.bat +++ b/setup-debug.bat @@ -6,7 +6,13 @@ set conan_profile=scwx-win64_msvc2022 set qt_version=6.8.0 set qt_arch=msvc2022_64 -conan install tools/conan/profiles/%conan_profile% -tf profiles +conan config install tools/conan/profiles/%conan_profile% -tf profiles +conan install . ^ + --remote conancenter ^ + --build missing ^ + --profile:all %conan_profile% ^ + --settings:all build_type=%build_type% ^ + --output-folder %build_dir%/conan mkdir %build_dir% cmake -B %build_dir% -S . ^ @@ -14,6 +20,6 @@ cmake -B %build_dir% -S . ^ -DCMAKE_CONFIGURATION_TYPES=%build_type% ^ -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% ^ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake ^ - -DCONAN_HOST_PROFILE=${conan_profile} ^ - -DCONAN_BUILD_PROFILE=${conan_profile} + -DCONAN_HOST_PROFILE=%conan_profile% ^ + -DCONAN_BUILD_PROFILE=%conan_profile% pause diff --git a/setup-debug.sh b/setup-debug.sh index b832db88..0abb4696 100755 --- a/setup-debug.sh +++ b/setup-debug.sh @@ -8,7 +8,13 @@ qt_version=6.8.0 qt_arch=gcc_64 script_dir="$(dirname "$(readlink -f "$0")")" -conan install tools/conan/profiles/${conan_profile} -tf profiles +conan config install tools/conan/profiles/${conan_profile} -tf profiles +conan install . \ + --remote conancenter \ + --build missing \ + --profile:all ${conan_profile} \ + --settings:all build_type=${build_type} \ + --output-folder ${build_dir}/conan mkdir -p ${build_dir} cmake -B ${build_dir} -S . \ diff --git a/setup-multi.bat b/setup-multi.bat index 778b1328..9c555594 100644 --- a/setup-multi.bat +++ b/setup-multi.bat @@ -1,11 +1,21 @@ call tools\setup-common.bat -set build_dir=build-debug -set build_type=Debug -set qt_version=6.7.1 +set build_dir=build +set conan_profile=scwx-win64_msvc2022 +set qt_version=6.8.0 +set qt_arch=msvc2022_64 + +conan config install tools/conan/profiles/%conan_profile% -tf profiles +conan install . ^ + --remote conancenter ^ + --build missing ^ + --profile:all %conan_profile% ^ + --output-folder %build_dir%/conan mkdir %build_dir% cmake -B %build_dir% -S . ^ - -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64 ^ - -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake + -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% ^ + -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake ^ + -DCONAN_HOST_PROFILE=%conan_profile% ^ + -DCONAN_BUILD_PROFILE=%conan_profile% pause diff --git a/setup-release.bat b/setup-release.bat index c897302e..404ebdcd 100644 --- a/setup-release.bat +++ b/setup-release.bat @@ -6,7 +6,13 @@ set conan_profile=scwx-win64_msvc2022 set qt_version=6.8.0 set qt_arch=msvc2022_64 -conan install tools/conan/profiles/%conan_profile% -tf profiles +conan config install tools/conan/profiles/%conan_profile% -tf profiles +conan install . ^ + --remote conancenter ^ + --build missing ^ + --profile:all %conan_profile% ^ + --settings:all build_type=%build_type% ^ + --output-folder %build_dir%/conan mkdir %build_dir% cmake -B %build_dir% -S . ^ @@ -14,6 +20,6 @@ cmake -B %build_dir% -S . ^ -DCMAKE_CONFIGURATION_TYPES=%build_type% ^ -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% ^ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake ^ - -DCONAN_HOST_PROFILE=${conan_profile} ^ - -DCONAN_BUILD_PROFILE=${conan_profile} + -DCONAN_HOST_PROFILE=%conan_profile% ^ + -DCONAN_BUILD_PROFILE=%conan_profile% pause diff --git a/setup-release.sh b/setup-release.sh index 75b05f66..9b4f2779 100755 --- a/setup-release.sh +++ b/setup-release.sh @@ -8,7 +8,13 @@ qt_version=6.8.0 qt_arch=gcc_64 script_dir="$(dirname "$(readlink -f "$0")")" -conan install tools/conan/profiles/${conan_profile} -tf profiles +conan config install tools/conan/profiles/${conan_profile} -tf profiles +conan install . \ + --remote conancenter \ + --build missing \ + --profile:all ${conan_profile} \ + --settings:all build_type=${build_type} \ + --output-folder ${build_dir}/conan mkdir -p ${build_dir} cmake -B ${build_dir} -S . \ diff --git a/tools/setup-common.bat b/tools/setup-common.bat index a5696f89..bada34ed 100644 --- a/tools/setup-common.bat +++ b/tools/setup-common.bat @@ -1,4 +1,4 @@ pip install --upgrade conan pip install --upgrade geopandas pip install --upgrade GitPython -conan profile detect +conan profile detect -e diff --git a/tools/setup-common.sh b/tools/setup-common.sh index d00ebc0a..2533d6ec 100755 --- a/tools/setup-common.sh +++ b/tools/setup-common.sh @@ -2,4 +2,4 @@ pip install --upgrade --user conan pip install --upgrade --user geopandas pip install --upgrade --user GitPython -conan profile detect +conan profile detect -e