mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 01:30:05 +00:00
Setup script fixes
This commit is contained in:
parent
6e13ed2c85
commit
d6a0a17d3f
7 changed files with 49 additions and 15 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 . \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 . \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
pip install --upgrade conan
|
||||
pip install --upgrade geopandas
|
||||
pip install --upgrade GitPython
|
||||
conan profile detect
|
||||
conan profile detect -e
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue