0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-05 20:37:37 +03:00

Fixed build issues

Fixed build with cmake when including limereport as a submodule with add_subdirectory(...)
Removed unnecessary checks of ENABLE DIALOG DESIGNER in CMakeLists.txt
Fixed Qt 5.15.16 incompatibility
Added missing LIMEREPORT_EXPORT
Fixed warnings
This commit is contained in:
Константин Макаренков
2025-03-12 14:30:56 +03:00
parent 33ebdfc640
commit ebbf2b7beb
15 changed files with 62 additions and 53 deletions

View File

@@ -4,7 +4,7 @@ if(GIT_EXECUTABLE)
# Generate a git-describe version string from Git repository tags
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -22,7 +22,7 @@ if(NOT DEFINED GIT_VERSION)
endif()
configure_file(
${CMAKE_SOURCE_DIR}/limereport/version.h.in
${CMAKE_BINARY_DIR}/limereport/version.h
${CMAKE_CURRENT_SOURCE_DIR}/limereport/version.h.in
${CMAKE_CURRENT_BINARY_DIR}/limereport/version.h
@ONLY)