The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-14 11:06:19 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fixup undefined variables

Browse Source 
Remove unused variables, define variables for all platforms
and fix typo
This commit is contained in:
Christian Hohnstädt 2021-12-31 09:42:41 +01:00
parent 3f5930a4f3
commit 06fbe10d24
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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)

2
cmake/git_version.cmake
View File

@ -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()

2
doc/conf.py.in
View File

@ -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 ---------------------------------------------------

1
lib/CMakeLists.txt
View File

@ -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}
)

1
widgets/CMakeLists.txt
View File

@ -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}
)