|
@@ -196,10 +196,20 @@ install(
|
|
|
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
|
)
|
|
|
|
|
|
-if (DEFINED ENV{APPVEYOR_REPO_COMMIT})
|
|
|
- set(CPACK_PACKAGE_VERSION $ENV{APPVEYOR_REPO_COMMIT})
|
|
|
+
|
|
|
+if (NOT DEFINED ENV{APPVEYOR_REPO_TAG_NAME} AND DEFINED ENV{APPVEYOR_REPO_COMMIT})
|
|
|
+ string(SUBSTRING $ENV{APPVEYOR_REPO_COMMIT} 0 7 short_commit)
|
|
|
+endif()
|
|
|
+
|
|
|
+if (NOT DEFINED ENV{TRAVIS_TAG} AND DEFINED ENV{TRAVIS_COMMIT})
|
|
|
+ string(SUBSTRING $ENV{TRAVIS_COMMIT} 0 7 short_commit)
|
|
|
endif()
|
|
|
|
|
|
+if (DEFINED short_commit)
|
|
|
+ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}+${short_commit}")
|
|
|
+endif()
|
|
|
+
|
|
|
+
|
|
|
include(CPack)
|
|
|
|
|
|
add_subdirectory(libs)
|