Commit 61cf8766 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'CoreApp_No_GLOB' into 'master'

Core app no glob

See merge request !183
parents 651af095 22346ceb
...@@ -33,46 +33,157 @@ if( APPLE ) ...@@ -33,46 +33,157 @@ if( APPLE )
) )
endif(APPLE) endif(APPLE)
if (WIN32) # collect all header,source and ui files
SET(WIN_EXTRA_DIRS "../StackWalker" ) set (headers
else(WIN32) ../Core/Core.hh
SET(WIN_EXTRA_DIRS "") ../Core/OpenFunctionThread.hh
endif(WIN32) ../Core/PluginInfo.hh
../Core/SpinBoxEventFilter.hh
../Logging/PluginLogging.hh
../Scripting/ScriptingWrapper.hh
../Scripting/scriptPrototypes/prototypeDataType.hh
../Scripting/scriptPrototypes/prototypeIdList.hh
../Scripting/scriptPrototypes/prototypeMatrix4x4.hh
../Scripting/scriptPrototypes/prototypeVec3d.hh
../Scripting/scriptPrototypes/prototypeVec4d.hh
../Scripting/scriptWrappers/DataTypeWrapper.hh
../Scripting/scriptWrappers/idListWrapper.hh
../Scripting/scriptWrappers/matrix4x4Wrapper.hh
../Scripting/scriptWrappers/vec3dWrapper.hh
../Scripting/scriptWrappers/vec4dWrapper.hh
../widgets/aboutWidget/aboutWidget.hh
../widgets/addEmptyWidget/addEmptyWidget.hh
../widgets/loggerWidget/loggerWidget.hh
../widgets/coreWidget/ColorStatusBar.hh
../widgets/coreWidget/CoreWidget.hh
../widgets/coreWidget/SideArea.hh
../widgets/coreWidget/SideElement.hh
../widgets/helpWidget/helpBrowser.hh
../widgets/helpWidget/helpWidget.hh
../widgets/processManagerWidget/BlockingWidget.hh
../widgets/processManagerWidget/processManagerWidget.hh
../widgets/loadWidget/FileOptionsDialog.hh
../widgets/loadWidget/loadWidget.hh
../widgets/optionsWidget/ShortcutButton.hh
../widgets/optionsWidget/optionsWidget.hh
../widgets/PluginDialog/PluginDialog.hh
../widgets/viewModeWidget/viewModeChangeWidget.hh
../widgets/viewModeWidget/viewModeWidget.hh
../widgets/videoCaptureDialog/VideoCaptureDialog.hh
../widgets/snapshotDialog/SnapshotDialog.hh
../widgets/stereoSettingsWidget/stereoSettingsWidget.hh
../widgets/postProcessorWidget/postProcessorWidget.hh
../widgets/rendererWidget/TextBrowserWidget.hh
../widgets/rendererWidget/renderObjectHighLighter.hh
../widgets/rendererWidget/rendererObjectWidget.hh
../widgets/rendererWidget/rendererWidget.hh
../widgets/pythonWidget/PythonSyntaxHighlighter.hh
../widgets/pythonWidget/pythonWidget.hh
../PythonInterpreter/PythonInterpreter.hh
../PythonInterpreter/PythonTypeConversions.hh
)
# source code directories set( sources
set (directories ../OpenFlipper.cc
.. ../Core/BackupCommunication.cc
../Core ../Core/Core.cc
../Logging ../Core/Logging.cc
../Scripting ../Core/OpenFunctionThread.cc
../Scripting/scriptPrototypes ../Core/ParseIni.cc
../Scripting/scriptWrappers ../Core/ParseObj.cc
../widgets/aboutWidget ../Core/PluginCommunication.cc
../widgets/addEmptyWidget ../Core/PluginLoader.cc
../widgets/loggerWidget ../Core/RPC.cc
../widgets/coreWidget ../Core/SelectionCommunication.cc
../widgets/helpWidget ../Core/SpinBoxEventFilter.cc
../widgets/processManagerWidget ../Core/Video.cc
../widgets/loadWidget ../Core/openFunctions.cc
../widgets/optionsWidget ../Core/optionHandling.cc
../widgets/PluginDialog ../Core/process.cc
../widgets/viewModeWidget ../Core/saveFunctions.cc
../widgets/videoCaptureDialog ../Core/saveSettings.cc
../widgets/snapshotDialog ../Core/scripting.cc
../widgets/stereoSettingsWidget ../Logging/PluginLogging.cc
../widgets/postProcessorWidget ../Scripting/ScriptingWrapper.cc
../widgets/pythonWidget ../Scripting/scriptPrototypes/prototypeDataType.cc
../widgets/rendererWidget ../Scripting/scriptPrototypes/prototypeIdList.cc
${WIN_EXTRA_DIRS} ../Scripting/scriptPrototypes/prototypeMatrix4x4.cc
../Scripting/scriptPrototypes/prototypeVec3d.cc
../Scripting/scriptPrototypes/prototypeVec4d.cc
../Scripting/scriptWrappers/DataTypeWrapper.cc
../Scripting/scriptWrappers/idListWrapper.cc
../Scripting/scriptWrappers/matrix4x4Wrapper.cc
../Scripting/scriptWrappers/vec3dWrapper.cc
../Scripting/scriptWrappers/vec4dWrapper.cc
../widgets/aboutWidget/aboutWidget.cc
../widgets/addEmptyWidget/addEmptyWidget.cc
../widgets/loggerWidget/loggerWidget.cc
../widgets/coreWidget/About.cc
../widgets/coreWidget/ColorStatusBar.cc
../widgets/coreWidget/ContextMenu.cc
../widgets/coreWidget/CoreLicenseInfos.cc
../widgets/coreWidget/CoreWidget.cc
../widgets/coreWidget/CoreWidgetLogging.cc
../widgets/coreWidget/CoreWidgetToolbar.cc
../widgets/coreWidget/Help.cc
../widgets/coreWidget/LoggerHandling.cc
../widgets/coreWidget/MenuBar.cc
../widgets/coreWidget/Python.cc
../widgets/coreWidget/SideArea.cc
../widgets/coreWidget/SideElement.cc
../widgets/coreWidget/StackWidget.cc
../widgets/coreWidget/StatusBar.cc
../widgets/coreWidget/dragAndDrop.cc
../widgets/coreWidget/keyHandling.cc
../widgets/coreWidget/picking.cc
../widgets/coreWidget/postProcessorDialog.cc
../widgets/coreWidget/rendererDialog.cc
../widgets/coreWidget/viewMode.cc
../widgets/coreWidget/viewerControl.cc
../widgets/helpWidget/helpBrowser.cc
../widgets/helpWidget/helpWidget.cc
../widgets/processManagerWidget/BlockingWidget.cc
../widgets/processManagerWidget/processManagerWidget.cc
../widgets/loadWidget/FileOptionsDialog.cc
../widgets/loadWidget/loadWidget.cc
../widgets/optionsWidget/ShortcutButton.cc
../widgets/optionsWidget/downloader.cc
../widgets/optionsWidget/keyBindings.cc
../widgets/optionsWidget/optionsWidget.cc
../widgets/PluginDialog/PluginDialog.cc
../widgets/viewModeWidget/viewModeChangeWidget.cc
../widgets/viewModeWidget/viewModeWidget.cc
../widgets/videoCaptureDialog/VideoCaptureDialog.cc
../widgets/snapshotDialog/SnapshotDialog.cc
../widgets/stereoSettingsWidget/stereoSettingsWidget.cc
../widgets/postProcessorWidget/postProcessorWidget.cc
../widgets/pythonWidget/PythonSyntaxHighlighter.cc
../widgets/pythonWidget/pythonWidget.cc
../widgets/rendererWidget/TextBrowserWidget.cc
../widgets/rendererWidget/renderObjectHighLighter.cc
../widgets/rendererWidget/rendererObjectWidget.cc
../widgets/rendererWidget/rendererWidget.cc
) )
if (WIN32)
LIST(APPEND sources "../StackWalker/StackWalker.cc")
LIST(APPEND headers "../StackWalker/StackWalker.hh")
endif(WIN32)
if ( PYTHON3_FOUND) if ( PYTHON3_FOUND)
include_directories ( include_directories (
${Python3_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
) )
list(APPEND directories "../PythonInterpreter") list(APPEND headers
../PythonInterpreter/PythonInterpreter.hh
../PythonInterpreter/PythonTypeConversions.hh
)
list(APPEND sources
../PythonInterpreter/PythonInterpreter.cc
)
link_directories(${Python3_LIBRARY_DIRS}) link_directories(${Python3_LIBRARY_DIRS})
add_definitions(-DPYTHON_ENABLED ) add_definitions(-DPYTHON_ENABLED )
...@@ -81,13 +192,23 @@ if ( PYTHON3_FOUND) ...@@ -81,13 +192,23 @@ if ( PYTHON3_FOUND)
endif() endif()
# collect all header,source and ui files set( uifiles
acg_append_files (headers "*.hh" ${directories}) ../widgets/aboutWidget/aboutWidget.ui
acg_append_files (sources "*.cc" ${directories}) ../widgets/addEmptyWidget/addEmpty.ui
acg_append_files (ui-files "*.ui" ${directories}) ../widgets/helpWidget/helpWidget.ui
../widgets/processManagerWidget/processManagerWidget.ui
# remove template cc files from source file list ../widgets/optionsWidget/optionsWidget.ui
acg_drop_templates (sources) ../widgets/PluginDialog/pluginDialog.ui
../widgets/viewModeWidget/viewMode.ui
../widgets/viewModeWidget/viewModeChange.ui
../widgets/videoCaptureDialog/VideoCaptureDialog.ui
../widgets/snapshotDialog/SnapshotDialog.ui
../widgets/stereoSettingsWidget/stereoSettingsWidget.ui
../widgets/postProcessorWidget/postProcessorWidget.ui
../widgets/pythonWidget/pythonWidget.ui
../widgets/rendererWidget/rendererObjectWidget.ui
../widgets/rendererWidget/rendererWidget.ui
)
set(RC_SRC "") set(RC_SRC "")
...@@ -116,7 +237,7 @@ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/static_plugins.cc" ";\n} /* namespace c ...@@ -116,7 +237,7 @@ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/static_plugins.cc" ";\n} /* namespace c
list(APPEND RC_SRC "${CMAKE_CURRENT_BINARY_DIR}/static_plugins.cc") list(APPEND RC_SRC "${CMAKE_CURRENT_BINARY_DIR}/static_plugins.cc")
source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${sources} ${headers} ${ui-files} ) source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${sources} ${headers} ${uifiles} )
if (WIN32) if (WIN32)
# add app icon rc file to windows build # add app icon rc file to windows build
......
...@@ -88,28 +88,157 @@ endif() ...@@ -88,28 +88,157 @@ endif()
# Collect files to compile # Collect files to compile
#======================================================= #=======================================================
# source code directories set( headers
set (directories ../BasePlugin/AboutInfoInterface.hh
../BasePlugin ../BasePlugin/BackupInterface.hh
../ACGHelper ../BasePlugin/BaseInterface.hh
../common ../BasePlugin/ContextMenuInterface.hh
../threads ../BasePlugin/FileInterface.hh
../common/bsp ../BasePlugin/INIInterface.hh
../INIFile ../BasePlugin/InformationInterface.hh
../widgets/glWidget ../BasePlugin/KeyInterface.hh
../publicWidgets/objectSelectionWidget ../BasePlugin/LoadSaveInterface.hh
../widgets/filePicker ../BasePlugin/LoggingInterface.hh
../Utils/FileIO ../BasePlugin/MenuInterface.hh
../Utils/Memory ../BasePlugin/MetadataInterface.hh
../BasePlugin/MouseInterface.hh
../BasePlugin/OptionsInterface.hh
../BasePlugin/PickingInterface.hh
../BasePlugin/PluginConnectionInterface.hh
../BasePlugin/PluginFunctions.hh
../BasePlugin/PluginFunctionsCore.hh
../BasePlugin/PluginFunctionsSceneGraphWidget.hh
../BasePlugin/PluginFunctionsViewControls.hh
../BasePlugin/PostProcessorInterface.hh
../BasePlugin/ProcessInterface.hh
../BasePlugin/PythonFunctions.hh
../BasePlugin/PythonFunctionsCore.hh
../BasePlugin/PythonInterface.hh
../BasePlugin/RPCInterface.hh
../BasePlugin/RPCWrappers.hh
../BasePlugin/RPCWrappersHelper.hh
../BasePlugin/RenderInterface.hh
../BasePlugin/ScriptInterface.hh
../BasePlugin/SecurityInterface.hh
../BasePlugin/SelectionInterface.hh
../BasePlugin/StatusbarInterface.hh
../BasePlugin/TextureInterface.hh
../BasePlugin/ToolbarInterface.hh
../BasePlugin/ToolboxInterface.hh
../BasePlugin/TypeInterface.hh
../BasePlugin/ViewInterface.hh
../BasePlugin/ViewModeInterface.hh
../BasePlugin/WhatsThisGenerator.hh
../ACGHelper/DrawModeConverter.hh
../common/BackupData.hh
../common/BaseBackup.hh
../common/BaseObject.hh
../common/BaseObjectCore.hh
../common/BaseObjectData.hh
../common/BaseObjectDataT_impl.hh
../common/DataTypes.hh
../common/FileTypes.hh
../common/GlobalDefines.hh
../common/GlobalOptions.hh
../common/GroupObject.hh
../common/InformationPlugins.hh
../common/OFGLWidget.hh
../common/ObjectIDPointerManagerT.hh
../common/ObjectIDPointerManagerT_impl.hh
../common/ObjectTypeDLLDefines.hh
../common/OpenFlipperQSettings.hh
../common/PluginStorage.hh
../common/RecentFiles.hh
../common/RendererInfo.hh
../common/Types.hh
../common/TypesInternal.hh
../common/UpdateType.hh
../common/ViewObjectMarker.hh
../common/ViewerProperties.hh
../common/glew_wrappers.hh
../common/perObjectData.hh
../threads/JobInfo.hh
../threads/OpenFlipperThread.hh
../INIFile/INIFile.hh
../INIFile/INIFileT_impl.hh
../widgets/glWidget/CursorPainter.hh
../widgets/glWidget/PostProcessing.hh
../widgets/glWidget/QtBaseViewer.hh
../widgets/glWidget/QtGLGraphicsScene.hh
../widgets/glWidget/QtGLGraphicsView.hh
../widgets/glWidget/QtGLViewerLayout.hh
../widgets/glWidget/QtGraphicsButton.hh
../widgets/glWidget/QtMultiViewLayout.hh
../widgets/glWidget/QtSlideWindow.hh
../widgets/glWidget/simpleGLGraphicsScene.hh
../widgets/glWidget/simpleViewer.hh
../publicWidgets/objectSelectionWidget/SelectionObjectMarker.hh
../publicWidgets/objectSelectionWidget/TreeItemObjectSelection.hh
../publicWidgets/objectSelectionWidget/TreeModelObjectSelection.hh
../publicWidgets/objectSelectionWidget/objectPickDialog.hh
../publicWidgets/objectSelectionWidget/objectSelectionWidget.hh
../widgets/filePicker/FilePicker.hh
../Utils/FileIO/NumberParsing.hh
../Utils/Memory/RAMInfo.hh
) )
# collect all header,source and ui files set( sources
acg_append_files (headers "*.hh" ${directories}) ../BasePlugin/PluginFunctions.cc
acg_append_files (sources "*.cc" ${directories}) ../BasePlugin/PluginFunctionsBaseIterator.cc
acg_append_files (ui-files "*.ui" ${directories}) ../BasePlugin/PluginFunctionsIterator.cc
../BasePlugin/PostProcessorInterface.cc
../BasePlugin/PythonFunctions.cc
../BasePlugin/RPCWrappers.cc
../BasePlugin/RPCWrappersHelper.cc
../BasePlugin/WhatsThisGenerator.cc
../ACGHelper/DrawModeConverter.cc
../common/BackupData.cc
../common/BaseBackup.cc
../common/BaseObject.cc
../common/BaseObjectCore.cc
../common/BaseObjectData.cc
../common/FileTypes.cc
../common/GlobalOptions.cc
../common/GroupObject.cc
../common/InformationPlugins.cc
../common/OpenFlipperQSettings.cc
../common/PluginStorage.cc
../common/RecentFiles.cc
../common/RendererInfo.cc
../common/Types.cc
../common/UpdateType.cc
../common/ViewerProperties.cc
../common/glew_wrappers.cc
../common/perObjectData.cc
../threads/JobInfo.cc
../threads/OpenFlipperThread.cc
../INIFile/INIFile.cc
../widgets/glWidget/CursorPainter.cc
../widgets/glWidget/PostProcessing.cc
../widgets/glWidget/QtBaseViewer.cc
../widgets/glWidget/QtBaseViewerFlyAnimation.cc
../widgets/glWidget/QtBaseViewerPicking.cc
../widgets/glWidget/QtBaseViewer_qt.cc
../widgets/glWidget/QtGLGraphicsScene.cc
../widgets/glWidget/QtGLGraphicsView.cc
../widgets/glWidget/QtGLViewerLayout.cc
../widgets/glWidget/QtGraphicsButton.cc
../widgets/glWidget/QtMultiViewLayout.cc
../widgets/glWidget/QtSlideWindow.cc
../widgets/glWidget/simpleGLGraphicsScene.cc
../widgets/glWidget/simpleViewer.cc
../publicWidgets/objectSelectionWidget/SelectionObjectMarker.cc
../publicWidgets/objectSelectionWidget/TreeItemObjectSelection.cc
../publicWidgets/objectSelectionWidget/TreeModelObjectSelection.cc
../publicWidgets/objectSelectionWidget/objectPickDialog.cc
../publicWidgets/objectSelectionWidget/objectSelectionWidget.cc
../widgets/filePicker/FilePicker.cc
../Utils/FileIO/NumberParsing.cc
../Utils/Memory/RAMInfo.cc
)
source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${sources} ${headers} ${ui-files} ) source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${sources} ${headers} )
#======================================================= #=======================================================
# Cleanup # Cleanup
......
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