diff options
-rw-r--r-- | cmake/cpack.cmk | 5 | ||||
-rw-r--r-- | libproxy/Findlibproxy.cmake.in | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cmake/cpack.cmk b/cmake/cpack.cmk index 1bb828d..20529c8 100644 --- a/cmake/cpack.cmk +++ b/cmake/cpack.cmk @@ -10,9 +10,12 @@ function(set_project_version MAJOR MINOR PATCH) set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${PATCH}) - set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + set(CPACK_PACKAGE_VERSION "${MAJOR}.${MINOR}.${PATCH}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") set(PROJECT_VERSION "${CPACK_PACKAGE_VERSION}" PARENT_SCOPE) + set(PROJECT_VERSION_MAJOR "${MAJOR}" PARENT_SCOPE) + set(PROJECT_VERSION_MINOR "${MINOR}" PARENT_SCOPE) + set(PROJECT_VERSION_PATCH "${PATCH}" PARENT_SCOPE) include(CPack) endfunction(set_project_version) diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in index 4f13e4d..ef44489 100644 --- a/libproxy/Findlibproxy.cmake.in +++ b/libproxy/Findlibproxy.cmake.in @@ -14,6 +14,12 @@ FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h ) FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy ) +# Set library version +SET(LIBPROXY_VERSION @PROJECT_VERSION@) +SET(LIBPROXY_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) +SET(LIBPROXY_VERSION_MINOR @PROJECT_VERSION_MINOR@) +SET(LIBPROXY_VERSION_PATCH @PROJECT_VERSION_PATCH@) + # Give output, should this be wished (this handles also QUIET and REQUIRED INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(libproxy DEFAULT_MSG LIBPROXY_LIBRARIES LIBPROXY_INCLUDE_DIR) |