SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@993 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-26 18:54:19 +00:00
parent 0be9c0a34b
commit 11af411dfa
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -93,15 +93,15 @@ endif()
if(STATIC_LIB) if(STATIC_LIB)
set(PIP_LIB_TYPE STATIC) set(PIP_LIB_TYPE STATIC)
add_definitions(-DPIP_STATIC_DEFINE) add_definitions(-DPIP_STATIC_DEFINE)
message(STATUS "Building PIP static library") #message(STATUS "Building PIP static library")
else() else()
set(PIP_LIB_TYPE SHARED) set(PIP_LIB_TYPE SHARED)
message(STATUS "Building PIP shared library") #message(STATUS "Building PIP shared library")
endif() endif()
# Version # Version
set_version(pip set_version(PIP
MAJOR "${_PIP_MAJOR}" MAJOR "${_PIP_MAJOR}"
MINOR "${_PIP_MINOR}" MINOR "${_PIP_MINOR}"
REVISION "${_PIP_REVISION}" REVISION "${_PIP_REVISION}"
@@ -113,7 +113,7 @@ set_deploy_property(pip ${PIP_LIB_TYPE}
FULLNAME "${_PIP_DOMAIN}.pip" FULLNAME "${_PIP_DOMAIN}.pip"
COMPANY "${_PIP_COMPANY}" COMPANY "${_PIP_COMPANY}"
INFO "Platform-Independent Primitives") INFO "Platform-Independent Primitives")
message(STATUS "Building PIP version ${PIP_VERSION}") message(STATUS "Building PIP version ${PIP_VERSION} (${PIP_LIB_TYPE})")
if(MINGW) if(MINGW)
@@ -373,6 +373,7 @@ else()
endforeach() endforeach()
endif() endif()
list(APPEND LIBS_STATUS ${LIBS_MAIN}) list(APPEND LIBS_STATUS ${LIBS_MAIN})
import_version(pip PIP)
if(WIN32) if(WIN32)
make_rc(pip _RC) make_rc(pip _RC)
add_definitions(-DPSAPI_VERSION=1) add_definitions(-DPSAPI_VERSION=1)

2
cmake/FindPIP.cmake
View File

@@ -81,7 +81,7 @@ if(NOT PIP_VERSION)
set(PIP_VERSION ${_VERSION} CACHE STRING "VERSION") set(PIP_VERSION ${_VERSION} CACHE STRING "VERSION")
if (NOT _PIP_MSG) if (NOT _PIP_MSG)
set(_PIP_MSG 1 CACHE BOOL "msg_pip" FORCE) 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() endif()
else() else()
message(FATAL_ERROR "Can`t find PIP version file!") message(FATAL_ERROR "Can`t find PIP version file!")