minor cmake stuff

ossia · Sep 10, 2018 · 54bd0dc · 54bd0dc
1 parent f5c25f1
commit 54bd0dc
Show file tree

Hide file tree

Showing 44 changed files with 10 additions and 54 deletions.
diff --git a/CMake/Configurations/default-plugins.cmake b/CMake/Configurations/default-plugins.cmake
@@ -9,12 +9,12 @@ score-lib-process
 score-plugin-inspector
 score-plugin-deviceexplorer
 score-plugin-curve
+score-plugin-mapping
 score-plugin-automation
 score-plugin-library
 score-plugin-scenario
 score-plugin-loop
 
-score-plugin-mapping
 score-plugin-engine
 
 score-plugin-media

diff --git a/CMake/IScoreTargetSetup.cmake b/CMake/IScoreTargetSetup.cmake
@@ -7,6 +7,8 @@ function(score_cotire_pre TheTarget)
   if(SCORE_COTIRE)
     if(SCORE_COTIRE_DISABLE_UNITY)
       set_property(TARGET ${TheTarget} PROPERTY COTIRE_ADD_UNITY_BUILD FALSE)
+    else()
+      set_property(TARGET ${TheTarget} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES 9999)
     endif()
 
     if(SCORE_COTIRE_ALL_HEADERS)

diff --git a/Tests/Integration/CMakeLists.txt b/Tests/Integration/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(IntegrationTests)
 
 enable_testing()

diff --git a/Tests/testbed/CMakeLists.txt b/Tests/testbed/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_testbed LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
-
 project(score_base LANGUAGES CXX)
 enable_testing()
 

diff --git a/base/addon-skeleton/CMakeLists.txt b/base/addon-skeleton/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_addon_skeleton LANGUAGES CXX)
 
 # General initialization

diff --git a/base/addons/CMakeLists.txt b/base/addons/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
-
 project(score_addons LANGUAGES CXX)
 
 macro(SUBDIRLIST result curdir)

diff --git a/base/app-test/CMakeLists.txt b/base/app-test/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_testapp LANGUAGES CXX)
 
 enable_testing()

diff --git a/base/app/CMakeLists.txt b/base/app/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_app LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/lib/CMakeLists.txt b/base/lib/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_lib_base LANGUAGES CXX)
 score_common_setup()
 

diff --git a/base/lib/score/prefix.hpp b/base/lib/score/prefix.hpp
@@ -4,7 +4,7 @@
 #pragma GCC system_header
 #pragma clang system_header
 
-/////////
+//////////
 #include <ossia/detail/small_vector.hpp>
 #include <ossia/detail/string_map.hpp>
 

diff --git a/base/lib/tests/CMakeLists.txt b/base/lib/tests/CMakeLists.txt
@@ -1,5 +1,3 @@
-#cmake_minimum_required(VERSION 3.1)
-
 #include(CppcheckTargets)
 
 #set (TEST2_HDRS  "${CMAKE_SOURCE_DIR}/base/lib/presenter/command/Command.hpp"

diff --git a/base/player/CMakeLists.txt b/base/player/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_player LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/player/i-score-pd/CMakeLists.txt b/base/player/i-score-pd/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project("score-pd")
 
 set(CMAKE_SUPPRESS_REGENERATION true)

diff --git a/base/plugins/CMakeLists.txt b/base/plugins/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 enable_testing()
 
 # SCORE_PLUGINS_TO_BUILD is defined in the configuration.

diff --git a/base/plugins/score-lib-device/CMakeLists.txt b/base/plugins/score-lib-device/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_lib_device LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-lib-inspector/CMakeLists.txt b/base/plugins/score-lib-inspector/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_lib_inspector LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-lib-process/CMakeLists.txt b/base/plugins/score-lib-process/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_lib_process LANGUAGES CXX)
 score_common_setup()
 
@@ -119,4 +118,4 @@ target_compile_definitions(score_lib_process PUBLIC
 score_generate_command_list_file(${PROJECT_NAME} "${PROCESS_HDRS}")
 setup_score_plugin(score_lib_process)
 
-setup_score_tests(Tests)
+# setup_score_tests(Tests)
diff --git a/base/plugins/score-lib-process/Tests/CMakeLists.txt b/base/plugins/score-lib-process/Tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(ProcessTests)
 
 enable_testing()

diff --git a/base/plugins/score-lib-state/CMakeLists.txt b/base/plugins/score-lib-state/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_lib_state LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-lib-state/Tests/CMakeLists.txt b/base/plugins/score-lib-state/Tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(StateTests)
 set(CMAKE_AUTOMOC ON)
 enable_testing()

diff --git a/base/plugins/score-plugin-automation/Automation/AutomationExecution.cpp b/base/plugins/score-plugin-automation/Automation/AutomationExecution.cpp
@@ -7,7 +7,6 @@
 
 #include <Curve/CurveConversion.hpp>
 #include <Device/Protocol/DeviceInterface.hpp>
-#include <Explorer/DocumentPlugin/DeviceDocumentPlugin.hpp>
 #include <Process/ExecutionContext.hpp>
 #include <Process/ExecutionFunctions.hpp>
 namespace Automation

diff --git a/base/plugins/score-plugin-automation/Automation/Inspector/AutomationInspectorWidget.cpp b/base/plugins/score-plugin-automation/Automation/Inspector/AutomationInspectorWidget.cpp
@@ -4,11 +4,10 @@
 #include "AutomationInspectorWidget.hpp"
 
 #include <ossia/network/dataspace/dataspace_visitors.hpp>
-
+#include <score/document/DocumentContext.hpp>
 #include <Automation/AutomationModel.hpp>
 #include <Automation/Commands/ChangeAddress.hpp>
 #include <Automation/Commands/SetAutomationMax.hpp>
-#include <Explorer/DocumentPlugin/DeviceDocumentPlugin.hpp>
 #include <Device/Widgets/AddressAccessorEditWidget.hpp>
 #include <Inspector/InspectorWidgetBase.hpp>
 #include <QBoxLayout>

diff --git a/base/plugins/score-plugin-automation/CMakeLists.txt b/base/plugins/score-plugin-automation/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_automation LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-curve/CMakeLists.txt b/base/plugins/score-plugin-curve/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_curve LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-deviceexplorer/CMakeLists.txt b/base/plugins/score-plugin-deviceexplorer/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_deviceexplorer LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-deviceexplorer/Tests/CMakeLists.txt b/base/plugins/score-plugin-deviceexplorer/Tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_deviceexplorer_tests)
 enable_testing()
 include(CppcheckTargets)

diff --git a/base/plugins/score-plugin-engine/CMakeLists.txt b/base/plugins/score-plugin-engine/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_engine LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-fx/CMakeLists.txt b/base/plugins/score-plugin-fx/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_fx LANGUAGES CXX)
 
 set(HDRS

diff --git a/base/plugins/score-plugin-inspector/CMakeLists.txt b/base/plugins/score-plugin-inspector/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_inspector LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-js/CMakeLists.txt b/base/plugins/score-plugin-js/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_js LANGUAGES CXX)
 
 if(NOT TARGET score_plugin_engine)

diff --git a/base/plugins/score-plugin-library/CMakeLists.txt b/base/plugins/score-plugin-library/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_library LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-loop/CMakeLists.txt b/base/plugins/score-plugin-loop/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_loop LANGUAGES CXX)
 
 score_common_setup()

diff --git a/base/plugins/score-plugin-mapping/CMakeLists.txt b/base/plugins/score-plugin-mapping/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_mapping LANGUAGES CXX)
 
 score_common_setup()
@@ -41,8 +40,6 @@ set(SRCS
 add_library(${PROJECT_NAME} ${SRCS} ${HDRS})
 
 score_generate_command_list_file(${PROJECT_NAME} "${HDRS}")
-target_link_libraries(${PROJECT_NAME} PUBLIC
-                     Qt5::Core Qt5::Widgets
-                     score_lib_base score_lib_device score_plugin_deviceexplorer score_lib_process score_lib_state score_plugin_curve)
+target_link_libraries(${PROJECT_NAME} PUBLIC score_lib_base score_lib_inspector score_lib_process score_plugin_curve)
 
 setup_score_plugin(${PROJECT_NAME})
diff --git a/base/plugins/score-plugin-mapping/Mapping/Commands/ChangeAddresses.cpp b/base/plugins/score-plugin-mapping/Mapping/Commands/ChangeAddresses.cpp
@@ -7,7 +7,6 @@
 
 #include <Device/Address/AddressSettings.hpp>
 #include <Device/Node/DeviceNode.hpp>
-#include <Explorer/Explorer/DeviceExplorerModel.hpp>
 #include <Mapping/MappingModel.hpp>
 #include <QString>
 #include <QStringList>

diff --git a/base/plugins/score-plugin-mapping/Mapping/MappingExecution.cpp b/base/plugins/score-plugin-mapping/Mapping/MappingExecution.cpp
@@ -7,7 +7,6 @@
 
 #include <Curve/CurveConversion.hpp>
 #include <Device/Protocol/DeviceInterface.hpp>
-#include <Explorer/DocumentPlugin/DeviceDocumentPlugin.hpp>
 #include <Process/ExecutionFunctions.hpp>
 #include <Process/ExecutionContext.hpp>
 namespace Mapping

diff --git a/base/plugins/score-plugin-media/CMakeLists.txt b/base/plugins/score-plugin-media/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_media LANGUAGES CXX)
 
 include(ExternalProject)

diff --git a/base/plugins/score-plugin-midi/CMakeLists.txt b/base/plugins/score-plugin-midi/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_midi LANGUAGES CXX)
 
 if(IOS)

diff --git a/base/plugins/score-plugin-pluginsettings/CMakeLists.txt b/base/plugins/score-plugin-pluginsettings/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_pluginsettings LANGUAGES CXX)
 
 # Packages

diff --git a/base/plugins/score-plugin-recording/CMakeLists.txt b/base/plugins/score-plugin-recording/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(score_plugin_recording LANGUAGES CXX)
 
 if(NOT TARGET score_plugin_engine)

diff --git a/base/plugins/score-plugin-scenario/CMakeLists.txt b/base/plugins/score-plugin-scenario/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(score_plugin_scenario LANGUAGES CXX)
 score_common_setup()
 

diff --git a/base/plugins/score-plugin-scenario/tests/CMakeLists.txt b/base/plugins/score-plugin-scenario/tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.0)
 project(ScenarioTests LANGUAGES CXX)
 enable_testing()
 

diff --git a/tools/faust-to-score.sh b/tools/faust-to-score.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -eux
 
-if [[ "$1" == "" ]]; 
-	then
-	exit 1
+if [[ "$1" == "" ]];
+  then
+  exit 1
 fi
 
 FAUST_SRC=$1
@@ -20,7 +20,6 @@ mkdir "score-faust-$FAUST_NAME"
 cd "score-faust-$FAUST_NAME"
 
 echo "
-cmake_minimum_required(VERSION 3.1)
 set(CMAKE_AUTOMOC ON)
 project(score_faust_$FAUST_NAME LANGUAGES CXX)
 

diff --git a/tools/score-plugin-wizard/plugin.cmake b/tools/score-plugin-wizard/plugin.cmake
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.9)
 project(%ClassName%)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)