mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-13 20:02:22 +03:00
Code

Merge pull request #481 from tizbac/fixcmakesubdir

Browse Source 
Fix generating version.h.in when project is used as subdirectory
This commit is contained in:
Alexander Arin 2025-08-26 17:32:36 +03:00 committed by GitHub
commit 6943c356b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -397,7 +397,7 @@ set(GLOBAL_HEADERS
${PROJECT_NAME}/LRCallbackDS ${PROJECT_NAME}/LRCallbackDS
${PROJECT_NAME}/LRDataManager ${PROJECT_NAME}/LRDataManager
${PROJECT_NAME}/LRScriptManager ${PROJECT_NAME}/LRScriptManager
${CMAKE_BINARY_DIR}/limereport/version.h ${CMAKE_CURRENT_BINARY_DIR}/limereport/version.h
) )
set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR}) set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR})
@ -470,7 +470,7 @@ target_include_directories( ${PROJECT_NAME} PRIVATE
limereport/scripteditor ) limereport/scripteditor )
target_include_directories( ${PROJECT_NAME} PUBLIC target_include_directories( ${PROJECT_NAME} PUBLIC
${CMAKE_BINARY_DIR}/limereport ) ${CMAKE_CURRENT_BINARY_DIR}/limereport )
target_include_directories( ${PROJECT_NAME} INTERFACE target_include_directories( ${PROJECT_NAME} INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/include) ${CMAKE_CURRENT_SOURCE_DIR}/include)

4
cmake/modules/GenerateVersionHeader.cmake
View File

@ -22,7 +22,7 @@ if(NOT DEFINED GIT_VERSION)
endif() endif()
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/limereport/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/limereport/version.h.in
${CMAKE_BINARY_DIR}/limereport/version.h ${CMAKE_CURRENT_BINARY_DIR}/limereport/version.h
@ONLY) @ONLY)