diff options
| author | Jelle Spijker <j.spijker@ultimaker.com> | 2020-08-28 13:57:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 13:57:39 +0300 |
| commit | 2d1128f0880f5e6a82a64f5dda29c2e3ea520159 (patch) | |
| tree | cc65875d666cab1a6a1f3654653affdc7f83c5f0 /cmake | |
| parent | 4058790491e5c2b4857e7955de60b63230ed1723 (diff) | |
| parent | 5f2d721bdca9cdb8fe11117adf76250a8ae0b072 (diff) | |
Merge pull request #8196 from Ultimaker/speed_up_ci
Speed up ci
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CuraPluginInstall.cmake | 10 | ||||
| -rw-r--r-- | cmake/CuraTests.cmake | 15 |
2 files changed, 16 insertions, 9 deletions
diff --git a/cmake/CuraPluginInstall.cmake b/cmake/CuraPluginInstall.cmake index d35e74acb8..8d9efe1f12 100644 --- a/cmake/CuraPluginInstall.cmake +++ b/cmake/CuraPluginInstall.cmake @@ -9,6 +9,8 @@ # form of "a;b;c" or "a,b,c". By default all plugins will be installed. # +option(PRINT_PLUGIN_LIST "Should the list of plugins that are installed be printed?" ON) + # FIXME: Remove the code for CMake <3.12 once we have switched over completely. # FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. The FindPython3 # module is copied from the CMake repository here so in CMake <3.12 we can still use it. @@ -81,7 +83,9 @@ foreach(_plugin_json_path ${_plugin_json_list}) endif() if(_add_plugin) - message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}") + if(${PRINT_PLUGIN_LIST}) + message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}") + endif() get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY) install(DIRECTORY ${_rel_plugin_dir} DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir} @@ -90,7 +94,9 @@ foreach(_plugin_json_path ${_plugin_json_list}) ) list(APPEND _install_plugin_list ${_plugin_dir}) elseif(_is_no_install_plugin) - message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}") + if(${PRINT_PLUGIN_LIST}) + message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}") + endif() execute_process(COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod_bundled_packages_json.py -d ${CMAKE_CURRENT_SOURCE_DIR}/resources/bundled_packages ${_plugin_dir_name} diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index 0e62b84efa..babb86f745 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -49,6 +49,14 @@ function(cura_add_test) endif() endfunction() + +#Add code style test. +add_test( + NAME "code-style" + COMMAND ${Python3_EXECUTABLE} run_mypy.py + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +) + #Add test for import statements which are not compatible with all builds add_test( NAME "invalid-imports" @@ -67,13 +75,6 @@ foreach(_plugin ${_plugins}) endif() endforeach() -#Add code style test. -add_test( - NAME "code-style" - COMMAND ${Python3_EXECUTABLE} run_mypy.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - #Add test for whether the shortcut alt-keys are unique in every translation. add_test( NAME "shortcut-keys" |