diff --git a/3rdparty/tbb/CMakeLists.txt b/3rdparty/tbb/CMakeLists.txt index 10f60094ae..2d25a3a08e 100644 --- a/3rdparty/tbb/CMakeLists.txt +++ b/3rdparty/tbb/CMakeLists.txt @@ -106,6 +106,11 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS set(TBB_SOURCE_FILES ${lib_srcs} ${lib_hdrs}) set(tbb_version_file "version_string.ver") +if(NOT BUILD_INFO_SKIP_SYSTEM_VERSION) + set(TBB_HOST_VERSION " ${CMAKE_HOST_SYSTEM_VERSION}") +else() + set(TBB_HOST_VERSION "") +endif() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}.cmakein" "${CMAKE_CURRENT_BINARY_DIR}/${tbb_version_file}" @ONLY) list(APPEND TBB_SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${tbb_version_file}") diff --git a/3rdparty/tbb/version_string.ver.cmakein b/3rdparty/tbb/version_string.ver.cmakein index 1f8f0b818d..2953c1bc0c 100644 --- a/3rdparty/tbb/version_string.ver.cmakein +++ b/3rdparty/tbb/version_string.ver.cmakein @@ -1,6 +1,6 @@ #define __TBB_VERSION_STRINGS(N) \ #N": BUILD_PACKAGE OpenCV @OPENCV_VERSION@" ENDL \ -#N": BUILD_HOST @CMAKE_HOST_SYSTEM_NAME@ @CMAKE_HOST_SYSTEM_VERSION@ @CMAKE_HOST_SYSTEM_PROCESSOR@" ENDL \ +#N": BUILD_HOST @CMAKE_HOST_SYSTEM_NAME@@TBB_HOST_VERSION@ @CMAKE_HOST_SYSTEM_PROCESSOR@" ENDL \ #N": BUILD_TARGET @CMAKE_SYSTEM_NAME@ @CMAKE_SYSTEM_VERSION@ @CMAKE_SYSTEM_PROCESSOR@" ENDL \ #N": BUILD_COMPILER @CMAKE_CXX_COMPILER@ (ver @CMAKE_CXX_COMPILER_VERSION@)" ENDL \ #N": BUILD_COMMAND use cv::getBuildInformation() for details" ENDL diff --git a/CMakeLists.txt b/CMakeLists.txt index 54223fb1db..cc93888c93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1240,7 +1240,11 @@ endif() if(OPENCV_TIMESTAMP) status(" Timestamp:" ${OPENCV_TIMESTAMP}) endif() -status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}) +if(NOT BUILD_INFO_SKIP_SYSTEM_VERSION) + status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}) +else() + status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_PROCESSOR}) +endif() if(CMAKE_CROSSCOMPILING) status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}) endif()