diff options
| author | Saturneric <[email protected]> | 2021-12-10 15:22:35 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2021-12-10 15:22:35 +0000 |
| commit | 881b91eb43ed8171e214ca049168cc61b59db0a2 (patch) | |
| tree | f47f70cb6449c98f4e842417fdc9a022b61f2a7d /src | |
| parent | Merge branch 'develop' into develop-ui (diff) | |
| download | GpgFrontend-881b91eb43ed8171e214ca049168cc61b59db0a2.tar.gz GpgFrontend-881b91eb43ed8171e214ca049168cc61b59db0a2.zip | |
Add Support For UI Header include Path
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc7098e4..0c75be69 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -149,9 +149,9 @@ endif () if (APPLICATION_BUILD) if (${CMAKE_BUILD_TYPE} STREQUAL "Release") if (MINGW) - add_executable(${AppName} WIN32 ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS}) + add_executable(${AppName} WIN32 ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) elseif (APPLE) - add_executable(${AppName} MACOSX_BUNDLE ${ICON_RESOURCE} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS}) + add_executable(${AppName} MACOSX_BUNDLE ${ICON_RESOURCE} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) set_target_properties(${AppName} PROPERTIES BUNDLE True MACOSX_BUNDLE_GUI_IDENTIFIER pub.gpgfrontend.gpgfrontend @@ -169,7 +169,7 @@ if (APPLICATION_BUILD) WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMENT "Copying Resources into App Bundle Resource") elseif (LINUX) - add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS}) + add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) add_custom_command(TARGET ${AppName} POST_BUILD COMMAND /bin/mkdir -p ./gpgfrontend/usr/bin && /bin/mv -f ./${AppName} ./gpgfrontend/usr/bin/ WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} @@ -179,10 +179,10 @@ if (APPLICATION_BUILD) WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMENT "Complement to build the required architecture") else () - add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS}) + add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) endif () else () - add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS}) + add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) endif () # Make app build with resources diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index f4b00d22..7c6bf732 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -13,10 +13,11 @@ if (SMTP_SUPPORT) aux_source_directory(./smtp UI_SOURCE) endif () - add_library(gpgfrontend-ui STATIC ${UI_SOURCE}) - -target_link_libraries(gpgfrontend-ui +set(GPGFRONTEND_UI_LIB_NAME gpgfrontend-ui) +target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) +target_include_directories(gpgfrontend-ui PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/${GPGFRONTEND_UI_LIB_NAME}_autogen/include) target_compile_features(gpgfrontend-ui PUBLIC cxx_std_17)
\ No newline at end of file |