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

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)

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!")