diff options
author | shadchin <shadchin@yandex-team.ru> | 2022-02-10 16:44:30 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:44:30 +0300 |
commit | 2598ef1d0aee359b4b6d5fdd1758916d5907d04f (patch) | |
tree | 012bb94d777798f1f56ac1cec429509766d05181 /build/platform | |
parent | 6751af0b0c1b952fede40b19b71da8025b5d8bcf (diff) | |
download | ydb-2598ef1d0aee359b4b6d5fdd1758916d5907d04f.tar.gz |
Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/platform')
-rw-r--r-- | build/platform/cuda/ya.make | 32 | ||||
-rw-r--r-- | build/platform/lld/ya.make | 48 | ||||
-rw-r--r-- | build/platform/python/python27/ya.make | 10 | ||||
-rw-r--r-- | build/platform/python/python39/ya.make | 34 | ||||
-rw-r--r-- | build/platform/python/readme.md | 6 | ||||
-rw-r--r-- | build/platform/python/resources.inc | 10 | ||||
-rw-r--r-- | build/platform/python/tests/ya.make | 2 | ||||
-rw-r--r-- | build/platform/python/ya.make | 152 |
8 files changed, 147 insertions, 147 deletions
diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make index 3615f682cd..bde0967770 100644 --- a/build/platform/cuda/ya.make +++ b/build/platform/cuda/ya.make @@ -14,14 +14,14 @@ IF (USE_ARCADIA_CUDA) IF (CUDA_VERSION == "11.4") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2410761119) # CUDA Toolkit 11.4.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.3") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2213063565) # CUDA Toolkit 11.3.1 for Linux x86-64 - ELSEIF (CUDA_VERSION == "11.2") + DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2213063565) # CUDA Toolkit 11.3.1 for Linux x86-64 + ELSEIF (CUDA_VERSION == "11.2") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2073566375) # CUDA Toolkit 11.2.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1882836946) # CUDA Toolkit 11.1.1 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.0") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1647896014) # CUDA Toolkit 11.0.2 for Linux x86-64 - ELSEIF (CUDA_VERSION == "10.1") + ELSEIF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64 ELSE() ENABLE(CUDA_NOT_FOUND) @@ -40,7 +40,7 @@ IF (USE_ARCADIA_CUDA) ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE) IF (OS_LINUX AND ARCH_PPC64LE) - IF (CUDA_VERSION == "10.1") + IF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1586537264) # CUDA Toolkit 10.1.168 for Linux ppc64le ELSE() ENABLE(CUDA_NOT_FOUND) @@ -52,7 +52,7 @@ IF (USE_ARCADIA_CUDA) ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) IF (OS_DARWIN AND ARCH_X86_64) - IF (CUDA_VERSION == "10.1") + IF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978727023) # CUDA Toolkit 10.1.168 for macOS x86-64 ENDIF() @@ -62,11 +62,11 @@ IF (USE_ARCADIA_CUDA) ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) IF (OS_WINDOWS AND ARCH_X86_64) - IF (CUDA_VERSION == "11.3") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2215101513) # CUDA Toolkit 11.3.1 for Windows x86-64 - ELSEIF (CUDA_VERSION == "11.1") + IF (CUDA_VERSION == "11.3") + DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2215101513) # CUDA Toolkit 11.3.1 for Windows x86-64 + ELSEIF (CUDA_VERSION == "11.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1896564605) # CUDA Toolkit 11.1.1 for Windows x86-64 - ELSEIF (CUDA_VERSION == "10.1") + ELSEIF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978734165) # CUDA Toolkit 10.1.168 for Windows x86-64 ELSE() ENABLE(CUDA_NOT_FOUND) @@ -84,10 +84,10 @@ ENDIF() IF (USE_ARCADIA_CUDA_HOST_COMPILER) IF (HOST_OS_LINUX AND HOST_ARCH_X86_64) IF (OS_LINUX AND ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 - IF (CUDA_VERSION VERSION_LT "11.2") - # Equivalent to nvcc -allow-unsupported-compiler (present since 11.0). - CFLAGS(GLOBAL "-D__NV_NO_HOST_COMPILER_CHECK") + DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 + IF (CUDA_VERSION VERSION_LT "11.2") + # Equivalent to nvcc -allow-unsupported-compiler (present since 11.0). + CFLAGS(GLOBAL "-D__NV_NO_HOST_COMPILER_CHECK") ENDIF() ELSEIF(OS_LINUX AND ARCH_AARCH64) DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 @@ -97,7 +97,7 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER) ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE) IF (OS_LINUX AND ARCH_PPC64LE) - IF (CUDA_VERSION == "10.1") + IF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1566513994) # Clang 7.0 for Linux ppc64le (not latest) ELSE() ENABLE(CUDA_HOST_COMPILER_NOT_FOUND) @@ -110,7 +110,7 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER) ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) IF (OS_DARWIN AND ARCH_X86_64) SET(__XCODE_RESOURCE_NAME CUDA_HOST_TOOLCHAIN) - IF (CUDA_VERSION == "10.1") + IF (CUDA_VERSION == "10.1") SET(__XCODE_TOOLCHAIN_VERSION "9.2") # (not latest) ELSE() SET(__XCODE_TOOLCHAIN_VERSION "") @@ -129,7 +129,7 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER) # devtools/tools_build/pack_sdk.py msvc out.tar # Note: it will contain patched "VC/Auxiliary/Build/vcvarsall.bat" # to prevent "nvcc fatal : Host compiler targets unsupported OS." - IF (CUDA_HOST_MSVC_VERSION == "14.28.29910") + IF (CUDA_HOST_MSVC_VERSION == "14.28.29910") DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:2153212401) ELSE() MESSAGE(FATAL_ERROR "Unexpected or unspecified Microsoft Visual C++ CUDA host compiler version") diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make index c046e89098..808357eae9 100644 --- a/build/platform/lld/ya.make +++ b/build/platform/lld/ya.make @@ -4,13 +4,13 @@ LICENSE(Service-Prebuilt-Tool) OWNER(somov) -IF (USE_LTO OR USE_THINLTO) - IF (CLANG7 OR CLANG8) +IF (USE_LTO OR USE_THINLTO) + IF (CLANG7 OR CLANG8) # Use LLD 8 for old Clang because its IR code fails LLD 11 validation. ENABLE(USE_LLD8) - ELSEIF (CLANG11) - # DEVTOOLSSUPPORT-9065 - ENABLE(USE_LLD11) + ELSEIF (CLANG11) + # DEVTOOLSSUPPORT-9065 + ENABLE(USE_LLD11) ENDIF() ENDIF() @@ -29,31 +29,31 @@ ELSEIF (USE_LLD8) ENDIF() LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld") -ELSEIF (USE_LLD11) - IF (HOST_OS_LINUX) - IF (HOST_ARCH_PPC64LE) - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843381106) - ELSE() - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327433) - ENDIF() - ELSEIF (HOST_OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327928) - ENDIF() - - LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") +ELSEIF (USE_LLD11) + IF (HOST_OS_LINUX) + IF (HOST_ARCH_PPC64LE) + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843381106) + ELSE() + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327433) + ENDIF() + ELSEIF (HOST_OS_DARWIN) + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327928) + ENDIF() + + LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") ELSE() IF (HOST_OS_LINUX) IF (HOST_ARCH_PPC64LE) - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283417120) + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283417120) ELSE() - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283360772) + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283360772) ENDIF() ELSEIF (HOST_OS_DARWIN) - IF (HOST_ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283439721) - ELSE() - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283429958) - ENDIF() + IF (HOST_ARCH_ARM64) + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283439721) + ELSE() + DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283429958) + ENDIF() ENDIF() LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") diff --git a/build/platform/python/python27/ya.make b/build/platform/python/python27/ya.make index 35d2ef8405..a48304643f 100644 --- a/build/platform/python/python27/ya.make +++ b/build/platform/python/python27/ya.make @@ -8,11 +8,11 @@ OWNER( INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) IF (OS_LINUX) - IF (ARCH_ARM64 OR ARCH_AARCH64) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX_ARM64}) - ELSE() - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX}) - ENDIF() + IF (ARCH_ARM64 OR ARCH_AARCH64) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX_ARM64}) + ELSE() + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX}) + ENDIF() ELSEIF (OS_DARWIN) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_DARWIN}) ELSEIF (OS_WINDOWS) diff --git a/build/platform/python/python39/ya.make b/build/platform/python/python39/ya.make index 2579542d1e..dfc800e971 100644 --- a/build/platform/python/python39/ya.make +++ b/build/platform/python/python39/ya.make @@ -1,22 +1,22 @@ -RESOURCES_LIBRARY() - -OWNER( - g:contrib - g:yatool -) - -INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) - -IF (OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_LINUX}) -ELSEIF (OS_DARWIN) +RESOURCES_LIBRARY() + +OWNER( + g:contrib + g:yatool +) + +INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) + +IF (OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_LINUX}) +ELSEIF (OS_DARWIN) IF (ARCH_ARM64) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_DARWIN_ARM64}) ELSEIF(ARCH_X86_64) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_DARWIN}) ENDIF() -ELSEIF (OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_WINDOWS}) -ENDIF() - -END() +ELSEIF (OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/python/readme.md b/build/platform/python/readme.md index 1eaafad35b..d8f0963c3f 100644 --- a/build/platform/python/readme.md +++ b/build/platform/python/readme.md @@ -25,7 +25,7 @@ 6. `for path in $(ls packages); do ar -xf packages/$path; tar -xf data.tar.xz; done;` 7. `mv usr python` 8. `tar -czf python{PYTHON_VERSION}_linux.tar.gz python` -9. `ya upload python{PYTHON_VERSION}_linux.tar.gz -d "Ubuntu {UBUNTU_VERSION} x86_64 python{PYTHON_VERSION} installation" --do-not-remove` +9. `ya upload python{PYTHON_VERSION}_linux.tar.gz -d "Ubuntu {UBUNTU_VERSION} x86_64 python{PYTHON_VERSION} installation" --do-not-remove` UBUNTU_VERSION - версия ubuntu, на которой майнился системный питон @@ -40,7 +40,7 @@ UBUNTU_VERSION - версия ubuntu, на которой майнился си 3. `python/Python.framework/Python -> Versions/Current/Python` 4. `python/Python.framework/Resources -> Versions/Current/Resources` 6. `tar -czf python{PYTHON_VERSION}_darwin.tar.gz python` -7. `ya upload python{PYTHON_VERSION}_darwin.tar.gz -d "Darwin x86_64 python{PYTHON_VERSION} installation" --do-not-remove` +7. `ya upload python{PYTHON_VERSION}_darwin.tar.gz -d "Darwin x86_64 python{PYTHON_VERSION} installation" --do-not-remove` Если нужного питона нет в системе, его нужно установить из `python.org`, его установку можно найти в стандартном месте. @@ -52,7 +52,7 @@ UBUNTU_VERSION - версия ubuntu, на которой майнился си 2. Устанавливаем нужную версию питона из `python.org` 3. Копируем содержимое установки питона в директорию `python` 4. Пакуем директорию `python` в `python{PYTHON_VERSION}_windows.tar.gz` -5. `ya upload python{PYTHON_VERSION}_windows.tar.gz -d "Windows x86_64 python{PYTHON_VERSION} installation" --do-not-remove` +5. `ya upload python{PYTHON_VERSION}_windows.tar.gz -d "Windows x86_64 python{PYTHON_VERSION} installation" --do-not-remove` ## Добавляем бандлы системного питона в сборку diff --git a/build/platform/python/resources.inc b/build/platform/python/resources.inc index a730a5039b..901d5d0433 100644 --- a/build/platform/python/resources.inc +++ b/build/platform/python/resources.inc @@ -1,14 +1,14 @@ SET(PYTHON27_LINUX sbr:1666107838) # Different from others(compatible with running tests) DEVTOOLS-7424 SET(PYTHON34_LINUX sbr:419260733) SET(PYTHON35_LINUX sbr:1658217692) # Different from others(compatible with running tests) DEVTOOLS-7424 -SET(PYTHON36_LINUX sbr:2569180519) # Different from others(compatible with running tests) DEVTOOLS-7424 +SET(PYTHON36_LINUX sbr:2569180519) # Different from others(compatible with running tests) DEVTOOLS-7424 SET(PYTHON37_LINUX sbr:616675620) SET(PYTHON38_LINUX sbr:1211259884) -SET(PYTHON39_LINUX sbr:2019057022) +SET(PYTHON39_LINUX sbr:2019057022) SET(PYTHON310_LINUX sbr:2505611617) -SET(PYTHON27_LINUX_ARM64 sbr:2145006545) - +SET(PYTHON27_LINUX_ARM64 sbr:2145006545) + SET(PYTHON27_DARWIN sbr:426406952) SET(PYTHON34_DARWIN sbr:426379328) SET(PYTHON35_DARWIN sbr:426409804) @@ -28,5 +28,5 @@ SET(PYTHON35_WINDOWS sbr:410155020) SET(PYTHON36_WINDOWS sbr:410161131) SET(PYTHON37_WINDOWS sbr:629042628) SET(PYTHON38_WINDOWS sbr:1211466284) -SET(PYTHON39_WINDOWS sbr:2018972280) +SET(PYTHON39_WINDOWS sbr:2018972280) SET(PYTHON310_WINDOWS sbr:2506068927) diff --git a/build/platform/python/tests/ya.make b/build/platform/python/tests/ya.make index 0d8965240e..0665a86bbe 100644 --- a/build/platform/python/tests/ya.make +++ b/build/platform/python/tests/ya.make @@ -29,7 +29,7 @@ PEERDIR( build/platform/python/python36 build/platform/python/python37 build/platform/python/python38 - build/platform/python/python39 + build/platform/python/python39 build/platform/python/python310 ) diff --git a/build/platform/python/ya.make b/build/platform/python/ya.make index 247e65f4c9..101d453f88 100644 --- a/build/platform/python/ya.make +++ b/build/platform/python/ya.make @@ -9,34 +9,34 @@ INCLUDE(resources.inc) IF (USE_SYSTEM_PYTHON) IF (OS_LINUX) - IF (ARCH_ARM64 OR ARCH_AARCH64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX_ARM64}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ELSEIF (ARCH_X86_64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX}) - ELSEIF (_SYSTEM_PYTHON34) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_LINUX}) - ELSEIF (_SYSTEM_PYTHON35) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_LINUX}) - ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_LINUX}) - ELSEIF (_SYSTEM_PYTHON37) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_LINUX}) - ELSEIF (_SYSTEM_PYTHON38) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_LINUX}) - ELSEIF (_SYSTEM_PYTHON39) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_LINUX}) + IF (ARCH_ARM64 OR ARCH_AARCH64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX_ARM64}) + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ELSEIF (ARCH_X86_64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX}) + ELSEIF (_SYSTEM_PYTHON34) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_LINUX}) + ELSEIF (_SYSTEM_PYTHON35) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_LINUX}) + ELSEIF (_SYSTEM_PYTHON36) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_LINUX}) + ELSEIF (_SYSTEM_PYTHON37) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_LINUX}) + ELSEIF (_SYSTEM_PYTHON38) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_LINUX}) + ELSEIF (_SYSTEM_PYTHON39) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_LINUX}) ELSEIF (_SYSTEM_PYTHON310) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_LINUX}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() CFLAGS( GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include" @@ -44,38 +44,38 @@ IF (USE_SYSTEM_PYTHON) ) ELSEIF (OS_DARWIN) IF (PYTHON_DISTR == "macos-brew") - IF (ARCH_X86_64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562720527) - ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562721643) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) + IF (ARCH_X86_64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562720527) + ELSEIF (_SYSTEM_PYTHON36) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562721643) + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() ELSE() - IF (ARCH_X86_64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_DARWIN}) - ELSEIF (_SYSTEM_PYTHON34) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_DARWIN}) - ELSEIF (_SYSTEM_PYTHON35) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_DARWIN}) - ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_DARWIN}) - ELSEIF (_SYSTEM_PYTHON37) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_DARWIN}) - ELSEIF (_SYSTEM_PYTHON38) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN}) - ELSEIF (_SYSTEM_PYTHON39) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_DARWIN}) + IF (ARCH_X86_64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_DARWIN}) + ELSEIF (_SYSTEM_PYTHON34) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_DARWIN}) + ELSEIF (_SYSTEM_PYTHON35) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_DARWIN}) + ELSEIF (_SYSTEM_PYTHON36) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_DARWIN}) + ELSEIF (_SYSTEM_PYTHON37) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_DARWIN}) + ELSEIF (_SYSTEM_PYTHON38) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN}) + ELSEIF (_SYSTEM_PYTHON39) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_DARWIN}) ELSEIF (_SYSTEM_PYTHON310) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_DARWIN}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() ELSEIF(ARCH_ARM64) IF (_SYSTEM_PYTHON38) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN_ARM64}) @@ -86,42 +86,42 @@ IF (USE_SYSTEM_PYTHON) ELSE() ENABLE(PYTHON_NOT_FOUND) ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ENDIF() CFLAGS(GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/Python.framework/Versions/${PY_FRAMEWORK_VERSION}/include/python${PY_VERSION}") - ELSEIF (OS_WINDOWS) - IF (ARCH_X86_64) + ELSEIF (OS_WINDOWS) + IF (ARCH_X86_64) IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_WINDOWS}) ELSEIF (_SYSTEM_PYTHON34) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_WINDOWS}) ELSEIF (_SYSTEM_PYTHON35) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_WINDOWS}) ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_WINDOWS}) ELSEIF (_SYSTEM_PYTHON37) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_WINDOWS}) ELSEIF (_SYSTEM_PYTHON38) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_WINDOWS}) - ELSEIF (_SYSTEM_PYTHON39) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_WINDOWS}) + ELSEIF (_SYSTEM_PYTHON39) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_WINDOWS}) ELSEIF (_SYSTEM_PYTHON310) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_WINDOWS}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() CFLAGS(GLOBAL "/I$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include") LDFLAGS("/LIBPATH:$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/libs") ENDIF() - - IF (PYTHON_NOT_FOUND) - MESSAGE(FATAL_ERROR "No system Python ${USE_SYSTEM_PYTHON} for the selected platform") - ENDIF() + + IF (PYTHON_NOT_FOUND) + MESSAGE(FATAL_ERROR "No system Python ${USE_SYSTEM_PYTHON} for the selected platform") + ENDIF() ELSEIF (NOT USE_ARCADIA_PYTHON) CFLAGS(GLOBAL $PYTHON_FLAGS) IF (OS_WINDOWS) |