diff --git a/CMakeLists.txt b/CMakeLists.txt index e253236a..dd0450ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ endif () project(dxFeedGraalCxxApi) -set(DXFCXX_VERSION "0.1.2" CACHE STRING "The dxFeed Graal CXX API package version") +set(DXFCXX_VERSION "0.1.3" CACHE STRING "The dxFeed Graal CXX API package version") set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -49,18 +49,21 @@ option(DXFCXX_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) include(FetchContent) if (WIN32) - set(DXFCXX_TARGET_PLATFORM "amd64-windows") - set(DXFCXX_TARGET_PLATFORM_UNIFORM "x86_64-windows") + set(DXFCXX_GRAAL_TARGET_PLATFORM "amd64-windows") + set(DXFCXX_TARGET_PLATFORM "x86_64-windows") elseif (APPLE) if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64") + set(DXFCXX_GRAAL_TARGET_PLATFORM "aarch64-osx") set(DXFCXX_TARGET_PLATFORM "aarch64-osx") else () + set(DXFCXX_GRAAL_TARGET_PLATFORM "x86_64-osx") set(DXFCXX_TARGET_PLATFORM "x86_64-osx") endif () elseif (UNIX) - set(DXFCXX_TARGET_PLATFORM "amd64-linux") - set(DXFCXX_TARGET_PLATFORM_UNIFORM "x86_64-linux") + set(DXFCXX_GRAAL_TARGET_PLATFORM "amd64-linux") + set(DXFCXX_TARGET_PLATFORM "x86_64-linux") elseif () + set(DXFCXX_GRAAL_TARGET_PLATFORM "unknown") set(DXFCXX_TARGET_PLATFORM "unknown") endif () @@ -71,10 +74,10 @@ else () set(DXFEED_GRAAL_NATIVE_SDK_URL "${DXFEED_GRAAL_NATIVE_SDK_JFROG_BASE_URL}${DXFEED_GRAAL_NATIVE_SDK_VERSION}/graal-native-sdk-${DXFEED_GRAAL_NATIVE_SDK_VERSION}") endif () - if (DXFCXX_TARGET_PLATFORM STREQUAL "unknown") + if (DXFCXX_GRAAL_TARGET_PLATFORM STREQUAL "unknown") message(ERROR "Unknown platform!") else () - set(DXFEED_GRAAL_NATIVE_SDK_URL ${DXFEED_GRAAL_NATIVE_SDK_URL}-${DXFCXX_TARGET_PLATFORM}.zip) + set(DXFEED_GRAAL_NATIVE_SDK_URL ${DXFEED_GRAAL_NATIVE_SDK_URL}-${DXFCXX_GRAAL_TARGET_PLATFORM}.zip) endif () FetchContent_Declare(DxFeedGraalNativeSdk URL ${DXFEED_GRAAL_NATIVE_SDK_URL}) @@ -335,7 +338,7 @@ if (DXFCXX_INSTALL) set(CPACK_PACKAGE_VENDOR "Devexperts LLC") set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_VERSION "${DXFCXX_PACKAGE_VERSION}") - set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${DXFCXX_VERSION}-${DXFCXX_TARGET_PLATFORM_UNIFORM}${DXFCXX_PACKAGE_SUFFIX}") + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${DXFCXX_VERSION}-${DXFCXX_TARGET_PLATFORM}${DXFCXX_PACKAGE_SUFFIX}") include(CPack) if (DXFCXX_INSTALL_LIB)