From 06fbe10d24976ca2d720c4eb3df4bd79448877d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Hohnst=C3=A4dt?= <christian@hohnstaedt.de>
Date: Fri, 31 Dec 2021 09:42:41 +0100
Subject: [PATCH] cmake: fixup undefined variables

Remove unused variables, define variables for all platforms
and fix typo
---
 CMakeLists.txt          | 5 ++++-
 cmake/git_version.cmake | 2 +-
 doc/conf.py.in          | 2 +-
 lib/CMakeLists.txt      | 1 -
 widgets/CMakeLists.txt  | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a734cd44..0e9f9995 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,9 @@ add_executable(${CMAKE_PROJECT_NAME} img/imgres.qrc)
 add_executable(xcadoc xcadoc.cpp)
 target_include_directories(xcadoc PRIVATE "${PROJECT_SOURCE_DIR}/lib")
 
+set(PSQL_BINDIR "")
+set(MYSQL_BINDIR "")
+
 if (APPLE)
   execute_process(COMMAND brew --prefix OUTPUT_STRIP_TRAILING_WHITESPACE
                   OUTPUT_VARIABLE BREW_PREFIX ERROR_QUIET)
@@ -70,6 +73,7 @@ elseif(WIN32)
   endif()
 endif()
 
+
 find_package(OpenSSL REQUIRED)
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets Sql Help LinguistTools)
 get_target_property(qmake_executable Qt5::qmake IMPORTED_LOCATION)
@@ -84,7 +88,6 @@ endif()
 target_link_libraries(${CMAKE_PROJECT_NAME}
 	core widgets core
 	OpenSSL::Crypto
-	${LTDL_LIB}
 	Qt5::Widgets Qt5::Core Qt5::Sql Qt5::Help
 )
 target_link_libraries(xcadoc core Qt5::Core)
diff --git a/cmake/git_version.cmake b/cmake/git_version.cmake
index 9848f10a..d1f04741 100644
--- a/cmake/git_version.cmake
+++ b/cmake/git_version.cmake
@@ -27,7 +27,7 @@ if(Git_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
 		ERROR_QUIET
   )
   if(NOT GIT_COMMIT_COUNTER_RESULT)
-    math(EXPR PROJECT_VERSION_PATCH "${PROJECT_VERSIONV_PATCH} + ${GIT_COMMIT_COUNTER}")
+    math(EXPR PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH} + ${GIT_COMMIT_COUNTER}")
     set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
     message(STATUS "Commit counter: ${GIT_COMMIT_COUNTER} - ${GIT_REV} - ${PROJECT_VERSION}")
   endif()
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 30631517..6db5964c 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -22,7 +22,7 @@ copyright = '2021, Christian Hohnstädt'
 author = 'Christian Hohnstädt'
 
 # The full version, including alpha/beta/rc tags
-release = '@XCA_VERSION@'
+release = '@PROJECT_VERSION@'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 384a197b..bd488d3d 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -2,7 +2,6 @@ include_directories(${Qt5Sql_INCLUDE_DIRS}
 		${Qt5Core_INCLUDE_DIRS}
 		${Qt5Help_INCLUDE_DIRS}
 		${OPENSSL_INCLUDE_DIR}
-		${LTDL_INCLUDE_DIR}
 		${PROJECT_BINARY_DIR}
 		${PROJECT_SOURCE_DIR}
 )
diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index 30eac635..1f36d414 100644
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -3,7 +3,6 @@ include_directories(${Qt5Widgets_INCLUDE_DIRS}
                 ${Qt5Core_INCLUDE_DIRS}
                 ${Qt5Help_INCLUDE_DIRS}
                 ${OPENSSL_INCLUDE_DIR}
-		${LTDL_INCLUDE_DIR}
                 ${PROJECT_BINARY_DIR}
                 ${PROJECT_SOURCE_DIR}
 )