From 11af411dfae9fd477d3e3d353f3f7ddf71444a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 26 Mar 2020 18:54:19 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@993 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 9 +++++---- cmake/FindPIP.cmake | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccf5f3ff..f2d08b37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,15 +93,15 @@ endif() if(STATIC_LIB) set(PIP_LIB_TYPE STATIC) add_definitions(-DPIP_STATIC_DEFINE) - message(STATUS "Building PIP static library") + #message(STATUS "Building PIP static library") else() set(PIP_LIB_TYPE SHARED) - message(STATUS "Building PIP shared library") + #message(STATUS "Building PIP shared library") endif() # Version -set_version(pip +set_version(PIP MAJOR "${_PIP_MAJOR}" MINOR "${_PIP_MINOR}" REVISION "${_PIP_REVISION}" @@ -113,7 +113,7 @@ set_deploy_property(pip ${PIP_LIB_TYPE} FULLNAME "${_PIP_DOMAIN}.pip" COMPANY "${_PIP_COMPANY}" INFO "Platform-Independent Primitives") -message(STATUS "Building PIP version ${PIP_VERSION}") +message(STATUS "Building PIP version ${PIP_VERSION} (${PIP_LIB_TYPE})") if(MINGW) @@ -373,6 +373,7 @@ else() endforeach() endif() list(APPEND LIBS_STATUS ${LIBS_MAIN}) +import_version(pip PIP) if(WIN32) make_rc(pip _RC) add_definitions(-DPSAPI_VERSION=1) diff --git a/cmake/FindPIP.cmake b/cmake/FindPIP.cmake index bc850054..a34d6867 100644 --- a/cmake/FindPIP.cmake +++ b/cmake/FindPIP.cmake @@ -81,7 +81,7 @@ if(NOT PIP_VERSION) set(PIP_VERSION ${_VERSION} CACHE STRING "VERSION") if (NOT _PIP_MSG) set(_PIP_MSG 1 CACHE BOOL "msg_pip" FORCE) - message(STATUS "Found PIP: ${_PIP_LIBRARY_PATH_} (found version \"${PIP_VERSION}\")") + message(STATUS "Found PIP: ${_PIP_LIBRARY_PATH_} (version \"${PIP_VERSION}\")") endif() else() message(FATAL_ERROR "Can`t find PIP version file!")