diff --git a/cmake/cppsdk/libintel-ext-pt.installer.sh.in b/cmake/cppsdk/libintel-ext-pt.installer.sh.in index 002b0b753..066007f1b 100644 --- a/cmake/cppsdk/libintel-ext-pt.installer.sh.in +++ b/cmake/cppsdk/libintel-ext-pt.installer.sh.in @@ -11,7 +11,7 @@ LOGFILE="ipex-info" # Below values will be set automatically. DO NOT modify them manually! # Append new required relative_path/components in LIBIPEX_COMP_LIST in cmake scripts -LIBIPEX_VERSION="@CMAKE_PROJECT_VERSION@" +LIBIPEX_VERSION="@LIBIPEX_VERSION@" LIBIPEX_GITREV="@LIBIPEX_GITREV@" LIBIPEX_BUILD_TYPE="@CMAKE_BUILD_TYPE@" LIBIPEX_PACK_NAME="@CPACK_PACKAGE_NAME@" diff --git a/csrc/CMakeLists.txt b/csrc/CMakeLists.txt index d931bb76e..f2bec6f9a 100644 --- a/csrc/CMakeLists.txt +++ b/csrc/CMakeLists.txt @@ -1,5 +1,4 @@ set(IPEX_CSRC_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -set(LIBIPEX_GITREV "${IPEX_GITREV}") if(BUILD_MODULE_TYPE STREQUAL "GPU") add_subdirectory(${IPEX_CSRC_ROOT_DIR}/gpu) @@ -72,9 +71,9 @@ if(BUILD_MODULE_TYPE STREQUAL "CPPSDK") include(CPack) - set(INSTALL_SCRIPT "libintel-ext-pt-${CMAKE_PROJECT_VERSION}.run") + set(INSTALL_SCRIPT "libintel-ext-pt-${LIBIPEX_VERSION}.run") if(GLIBCXX_USE_CXX11_ABI) - set(INSTALL_SCRIPT "libintel-ext-pt-cxx11-abi-${CMAKE_PROJECT_VERSION}.run") + set(INSTALL_SCRIPT "libintel-ext-pt-cxx11-abi-${LIBIPEX_VERSION}.run") endif() configure_package_config_file( ${IPEX_ROOT_DIR}/cmake/cppsdk/libintel-ext-pt.installer.sh.in diff --git a/setup.py b/setup.py index fcea8c00f..11cc2e93c 100644 --- a/setup.py +++ b/setup.py @@ -533,7 +533,8 @@ def run(self): 'PYTHON_INCLUDE_DIR' : sysconfig.get_paths()['include'], 'PYTHON_EXECUTABLE' : sys.executable, 'IPEX_PROJ_NAME' : PACKAGE_NAME, - 'IPEX_GITREV' : ipex_git_sha, + 'LIBIPEX_GITREV' : ipex_git_sha, + 'LIBIPEX_VERSION' : ipex_build_version, } build_with_cpu = True # Default ON