pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Two small CMakeLists fixes (as discussed) (#1420)

Browse source 
* include (GNUInstallDirs) before using ${CMAKE_INSTALL_LIBDIR}

While here, trim some needless whitespace.

* Do not explicitly set APP_REVISION to an empty string

This allows to pass it on the command line when building from
GitHub-generated release tarballs which lack any Git metadata.
This commit is contained in:
Alexey Dokuchaev 2024-05-28 00:12:26 -05:00 • committed by GitHub
parent b6f2f41677
commit 09ac0f05ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -245,8 +245,6 @@ if(REVISION_FROM_GIT AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
) )
message(STATUS "Detected git revision: '${APP_REVISION}'.") message(STATUS "Detected git revision: '${APP_REVISION}'.")
else()
set(APP_REVISION "")
endif() endif()
if(NOT NO_LITE) if(NOT NO_LITE)

15
src/librssguard/CMakeLists.txt
View file

@ -498,20 +498,12 @@ add_library(rssguard SHARED ${SOURCES} ${QM_FILES})
if(FORCE_BUNDLE_ICONS) if(FORCE_BUNDLE_ICONS)
target_compile_definitions(rssguard target_compile_definitions(rssguard
PRIVATE PRIVATE
FORCE_BUNDLE_ICONS FORCE_BUNDLE_ICONS
) )
message(STATUS "Forcibly bundling icon themes.") message(STATUS "Forcibly bundling icon themes.")
endif() endif()
# Add specific definitions.
target_compile_definitions(rssguard
PRIVATE
RSSGUARD_DLLSPEC=Q_DECL_EXPORT
RSSGUARD_LIBDIR="${CMAKE_INSTALL_LIBDIR}"
)
target_include_directories(rssguard target_include_directories(rssguard
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@ -643,6 +635,13 @@ elseif(APPLE)
set(HEADERS_FOLDER "Contents/Resources/Include") set(HEADERS_FOLDER "Contents/Resources/Include")
endif() endif()
# Add specific definitions.
target_compile_definitions(rssguard
PRIVATE
RSSGUARD_DLLSPEC=Q_DECL_EXPORT
RSSGUARD_LIBDIR="${CMAKE_INSTALL_LIBDIR}"
)
# Install public headers. # Install public headers.
set(HEADERS_ROOT "${PROJECT_SOURCE_DIR}/src/librssguard") set(HEADERS_ROOT "${PROJECT_SOURCE_DIR}/src/librssguard")
file(GLOB_RECURSE HEADER_FILES RELATIVE ${HEADERS_ROOT} "*.h") file(GLOB_RECURSE HEADER_FILES RELATIVE ${HEADERS_ROOT} "*.h")