Don't include the -pre in install dir path.

We version the docs install path, but there's no reason to include the
-pre and git sha in the version for the path. With the git sha in
particular, it could result in having a bunch of dirs for each separate
git commit (annoying).

This resolves #1928.

CMakeLists.txt

@@ -28,6 +28,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 # 'core' CMake stuff
 include(Conky)
 
+# Set project version, languages
+project(conky VERSION ${RELEASE_VERSION} LANGUAGES C CXX)
+
 # Handle build options
 include(ConkyBuildOptions)
 
@@ -76,7 +79,7 @@ if(BUILD_TESTS)
 endif()
 
 if(NOT DEFINED DOC_PATH)
-  set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}")
+  set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${RELEASE_VERSION}")
 endif(NOT DEFINED DOC_PATH)
 
 set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)

cmake/Conky.cmake

@@ -176,11 +176,13 @@ execute_process(COMMAND ${APP_GIT} rev-parse --short HEAD
   OUTPUT_VARIABLE GIT_SHORT_SHA
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+set(RELEASE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+
 if(RELEASE)
-  set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+  set(VERSION ${RELEASE_VERSION})
 else(RELEASE)
   set(VERSION
-    "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-pre-${GIT_SHORT_SHA}")
+    "${RELEASE_VERSION}-pre-${GIT_SHORT_SHA}")
 endif(RELEASE)
 
 set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2024")