Commit 7ab43c37 authored by Jan Möbius's avatar Jan Möbius

Do not search for ui files as they are handled by autouic

parent 62636f7f
......@@ -75,7 +75,6 @@ set (directories
# collect all header,source and ui files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
acg_append_files (ui "*.ui" ${directories})
# remove template cc files from source file list
acg_drop_templates (sources)
......@@ -111,14 +110,14 @@ RECURSE_GROUPS( ${CMAKE_CURRENT_SOURCE_DIR}/../../ )
if (WIN32)
# add app icon rc file to windows build
acg_add_executable (${OPENFLIPPER_PRODUCT_STRING} WIN32 ${CMAKE_CURRENT_SOURCE_DIR}/CoreApp.rc ${ui} ${sources} ${headers} ${RC_SRC})
acg_add_executable (${OPENFLIPPER_PRODUCT_STRING} WIN32 ${CMAKE_CURRENT_SOURCE_DIR}/CoreApp.rc ${sources} ${headers} ${RC_SRC})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (${OPENFLIPPER_PRODUCT_STRING} ${QT_QTMAIN_LIBRARY})
elseif (APPLE)
# generate bundle on mac
acg_add_executable (${OPENFLIPPER_PRODUCT_STRING} MACOSX_BUNDLE ${ui} ${sources} ${headers} ${RC_SRC})
acg_add_executable (${OPENFLIPPER_PRODUCT_STRING} MACOSX_BUNDLE ${sources} ${headers} ${RC_SRC})
else ()
acg_add_executable (${OPENFLIPPER_PRODUCT_STRING} ${ui} ${sources} ${headers} ${RC_SRC})
acg_add_executable (${OPENFLIPPER_PRODUCT_STRING} ${sources} ${headers} ${RC_SRC})
endif ()
# Mark this build part as building OpenFlippers Core
......
......@@ -110,7 +110,6 @@ set (directories
# collect all header,source and ui files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
acg_append_files (ui "*.ui" ${directories})
#=======================================================
# Cleanup
......@@ -125,7 +124,7 @@ acg_drop_templates (sources)
RECURSE_GROUPS( ${CMAKE_CURRENT_SOURCE_DIR}/../../ )
if (QT5_FOUND)
acg_add_library (OpenFlipperPluginLib SHARED ${ui} ${sources} ${headers} )
acg_add_library (OpenFlipperPluginLib SHARED ${sources} ${headers} )
endif ()
......
......@@ -371,9 +371,8 @@ macro (_plugin_licensemanagement)
if ( OPENFLIPPER_ENABLE_LICENSE_KEY_GENERATOR )
acg_append_files (keygen_hdr "*.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
acg_append_files (keygen_src "*.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
acg_append_files (keygen_ui "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager/keyGen")
add_executable (Plugin-${plugin}-keygen ${keygen_ui} ${keygen_hdr} ${keygen_src})
add_executable (Plugin-${plugin}-keygen ${keygen_hdr} ${keygen_src})
target_link_libraries (
Plugin-${plugin}-keygen
......@@ -404,7 +403,6 @@ macro (_plugin_licensemanagement)
if ( OPENFLIPPER_ENABLE_LICENSE_MANAGER )
acg_append_files (headers "LicenseManagerActive.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
acg_append_files (sources "LicenseManagerActive.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
# acg_append_files (ui "*.ui" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
else(OPENFLIPPER_ENABLE_LICENSE_MANAGER)
acg_append_files (headers "LicenseManagerDisabled.hh" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
acg_append_files (sources "LicenseManagerDisabled.cc" "${CMAKE_SOURCE_DIR}/OpenFlipper/LicenseManager")
......@@ -615,7 +613,6 @@ function (_build_openflipper_plugin plugin)
acg_append_files (sources "*.cc" ${directories})
acg_append_files (sources "*.cpp" ${directories})
acg_append_files (sources "*.c" ${directories})
acg_append_files (ui "*.ui" ${directories})
acg_append_files (qrc "*.qrc" ${directories})
# remove template cc files from source file list
......@@ -625,7 +622,6 @@ function (_build_openflipper_plugin plugin)
if (COMMAND acg_list_filter)
acg_list_filter (headers)
acg_list_filter (sources)
acg_list_filter (ui)
endif ()
set(${_PLUGIN}_LICENSE_DEFS "")
......@@ -639,7 +635,7 @@ function (_build_openflipper_plugin plugin)
add_definitions(${${_PLUGIN}_TYPE_DEFINITIONS})
add_library (Plugin-${plugin} MODULE ${ui} ${sources} ${headers} ${qrc} ${${_PLUGIN}_ADDSRC})
add_library (Plugin-${plugin} MODULE ${sources} ${headers} ${qrc} ${${_PLUGIN}_ADDSRC})
#group projects by parent folder name on MSVC (used for e.g. plugincollection)
get_filename_component(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
get_filename_component(PARENT_DIR_NAME "${PARENT_DIR}" NAME)
......
......@@ -40,7 +40,6 @@ endif ()
# collect all header,source files
acg_append_files_recursive (headers "*.hh" . )
acg_append_files_recursive (sources "*.cc" . )
acg_append_files_recursive (ui "*.ui" . )
# Match our current directory name
......@@ -61,7 +60,7 @@ include_directories (
# remove template cc files from source file list
acg_drop_templates (sources)
acg_add_library ( ${TYPENAME} SHARED ${ui} ${sources} ${headers})
acg_add_library ( ${TYPENAME} SHARED ${sources} ${headers})
set_target_properties ( ${TYPENAME} PROPERTIES MACOSX_RPATH 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment