diff --git a/CMakeLists.txt b/CMakeLists.txt index d4d29110c6..5ef75e4f23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,7 +151,7 @@ find_library( /opt/local/lib64 REQUIRED ) -message("IIO LIBRARIES: " ${IIO_LIBRARIES}) +message(STATUS "IIO LIBRARIES: " ${IIO_LIBRARIES}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(SCOPY_DLL_BUILD_PATH ${CMAKE_BINARY_DIR}/Scopy.app/Contents/Frameworks) diff --git a/ci/ubuntu/ubuntu_build_process.sh b/ci/ubuntu/ubuntu_build_process.sh index 0bc96c8343..7705b0af8b 100755 --- a/ci/ubuntu/ubuntu_build_process.sh +++ b/ci/ubuntu/ubuntu_build_process.sh @@ -332,8 +332,7 @@ build_scopy() { ls -la $SRC_DIR pushd $SRC_DIR CURRENT_BUILD_CMAKE_OPTS="\ - -DENABLE_PLUGIN_TEST=ON \ - -DENABLE_TESTING=ON + -DENABLE_ALL_PACKAGES=ON " build_with_cmake OFF popd diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 4c58d91c0b..7e91d3abaa 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -61,7 +61,7 @@ if(QWT_INCLUDE_DIRS) if(NOT QWT_WRONG_VERSION) set(QWT_FOUND TRUE) else(NOT QWT_WRONG_VERSION) - message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}") + message(NOTICE "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}") endif(NOT QWT_WRONG_VERSION) endif(QWT_INCLUDE_DIRS) diff --git a/cmake/Modules/PackageUtils.cmake b/cmake/Modules/PackageUtils.cmake index 9bd09aeb09..d51df0198a 100644 --- a/cmake/Modules/PackageUtils.cmake +++ b/cmake/Modules/PackageUtils.cmake @@ -24,6 +24,7 @@ function(add_subdirectories_with_options base_dir output_dir prefix) file(GLOB CHILDREN RELATIVE ${base_dir} ${base_dir}/*) foreach(child ${CHILDREN}) + message("") if(IS_DIRECTORY ${base_dir}/${child}) string(TOUPPER ${child} CHILD_UPPER) set(ENABLE_CHILD_VAR "${prefix}_${CHILD_UPPER}") @@ -34,7 +35,7 @@ function(add_subdirectories_with_options base_dir output_dir prefix) endif() if(${ENABLE_CHILD_VAR}) - message(STATUS "Including ${prefix}: ${child}") + message(STATUS "${prefix}: ${child}") # Set output directories based on platform if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") @@ -46,10 +47,11 @@ function(add_subdirectories_with_options base_dir output_dir prefix) if(EXISTS "${base_dir}/${child}/CMakeLists.txt") add_subdirectory(${base_dir}/${child}) else() - message(STATUS "No CMakeLists.txt in subdirectory: ${base_dir}/${child}") + message(NOTICE "No CMakeLists.txt in subdirectory: ${base_dir}/${child}") endif() else() - message(STATUS "Skipping ${prefix}: ${child}") + message(STATUS "Skipping: ${child}") + message(STATUS "To enable this package use -D${ENABLE_CHILD_VAR}=ON") endif() endif() endforeach() @@ -61,9 +63,8 @@ function(enable_all base_dir enable prefix) if(IS_DIRECTORY ${base_dir}/${child}) string(TOUPPER ${child} CHILD_UPPER) set(ENABLE_CHILD_VAR "${prefix}_${CHILD_UPPER}") - if(NOT DEFINED ${ENABLE_CHILD_VAR}) - set(${ENABLE_CHILD_VAR} ${enable} CACHE BOOL "Enable ${prefix} ${child}") + set(${ENABLE_CHILD_VAR} ${enable} CACHE BOOL "Enable ${prefix} ${child}" FORCE) endif() endif() endforeach() @@ -83,19 +84,19 @@ endfunction() function(include_emu_xml base_dir output_dir) if(IS_DIRECTORY ${base_dir}) - message("Found IIO Emulator XMLs in: " ${base_dir}) + message(STATUS "Found IIO Emulator XMLs in: " ${base_dir}) file(GLOB EMU_FILES ${base_dir}/*) if(EMU_FILES) file(COPY ${EMU_FILES} DESTINATION ${output_dir}) else() - message("No emulator files found in: ${base_dir}") + message(NOTICE "No emulator files found in: ${base_dir}") endif() endif() endfunction() function(include_resources base_dir output_dir) if(NOT EXISTS ${base_dir}) - message(STATUS "Resources directory doesn't exist: ${base_dir}") + message(NOTICE "Resources directory doesn't exist: ${base_dir}") return() endif() file(GLOB children RELATIVE ${base_dir} ${base_dir}/*) @@ -139,7 +140,10 @@ function(install_plugins SRC_DIR INSTALL_DEST TARGET_PREFIX) PATTERN "resources.qrc.depends" EXCLUDE ) else() - message(STATUS "No resources to install (only resources.qrc.depends found).") + message( + NOTICE + "No resources to install for: ${plugin} (only resources.qrc.depends found)." + ) endif() endif() endif() diff --git a/cmake/Modules/ScopyAbout.cmake b/cmake/Modules/ScopyAbout.cmake index 49c1c904b8..85ed4836ed 100644 --- a/cmake/Modules/ScopyAbout.cmake +++ b/cmake/Modules/ScopyAbout.cmake @@ -110,7 +110,7 @@ function(configure_about ABOUT_RESOURCES_DIR) set(BUILD_INFO ${BUILD_INFO}job_link:\ ${CI_JOB_LINK}\n) if(EXISTS ${CMAKE_SOURCE_DIR}/build-status) - message("build-status found in ${CMAKE_SOURCE_DIR}.. populating") + message(STATUS "build-status found in ${CMAKE_SOURCE_DIR}.. populating") file(READ ${CMAKE_SOURCE_DIR}/build-status SCOPY_BUILD_STATUS_INFO) endif() else() @@ -144,6 +144,6 @@ function(configure_about ABOUT_RESOURCES_DIR) endforeach() configure_file(${ABOUT_RESOURCES_DIR}/aboutpage.qrc.cmakein ${ABOUT_RESOURCES_TARGET_DIR}/aboutpage.qrc @ONLY) - message(STATUS "built about page in - " ${ABOUT_RESOURCES_TARGET_DIR}/aboutpage.qrc) + message(STATUS "Built about page in - " ${ABOUT_RESOURCES_TARGET_DIR}/aboutpage.qrc) endfunction() diff --git a/cmake/Modules/ScopyMacOS.cmake b/cmake/Modules/ScopyMacOS.cmake index 35cba992bc..8b2a06ee30 100644 --- a/cmake/Modules/ScopyMacOS.cmake +++ b/cmake/Modules/ScopyMacOS.cmake @@ -70,9 +70,9 @@ macro(set_macosx_package_location source_dir location extension) foreach(_file ${files}) file(RELATIVE_PATH _relative_path ${source_dir} ${_file}) get_filename_component(parent_directory ${_relative_path} DIRECTORY) - message(parent_directory: ${parent_directory}) + message(STATUS "parent_directory: " ${parent_directory}) set_property(SOURCE ${_file} PROPERTY MACOSX_PACKAGE_LOCATION ${location}/${parent_directory}) - message(location/parent_directory ${location}/${parent_directory}) + message(STATUS "location/parent_directory: " ${location}/${parent_directory}) set(EXTRA_BUNDLE_FILES ${EXTRA_BUNDLE_FILES} ${_file}) endforeach() endmacro() diff --git a/cmake/Modules/ScopyStyle.cmake b/cmake/Modules/ScopyStyle.cmake index 28c8e1a7d3..7ea0ab81c0 100644 --- a/cmake/Modules/ScopyStyle.cmake +++ b/cmake/Modules/ScopyStyle.cmake @@ -39,6 +39,6 @@ function( if(NOT ret EQUAL "0") message(FATAL_ERROR "Failed to generate style files! error: ${ret}") else() - message("-- Generated style files") + message(STATUS "Generated style files") endif() endfunction() diff --git a/cmake/Modules/ScopyTranslation.cmake b/cmake/Modules/ScopyTranslation.cmake index c040bfb9ba..5177334195 100644 --- a/cmake/Modules/ScopyTranslation.cmake +++ b/cmake/Modules/ScopyTranslation.cmake @@ -30,7 +30,6 @@ function(generate_translations OUTPUT_LOC) ) qt_add_translation(QM_FILES ${TS_FILES}) - message("Translations QM: " ${QM_FILES}) set(TRANSLATIONS) foreach(file ${TS_FILES}) get_filename_component(file_name ${file} NAME_WE) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index f4e800bde2..b1353a1fbe 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -85,7 +85,7 @@ if(${WITH_PYTHON}) set(PYTHON_VERSION ${PYTHON_VERSION} PARENT_SCOPE) if(NOT Python3_FOUND) set(WITH_PYTHON OFF) - message(STATUS "Python not found") + message(NOTICE "Python not found") endif() set(BUILD_PYTHON_LIBRARY_DIRS ${Python3_LIBRARY_DIRS}/${PYTHON_VERSION}) endif() @@ -99,7 +99,7 @@ if(WITH_SIGROK) pkg_get_variable(LIBSIGROK_DECODERS_DIR libsigrokdecode decodersdir) if(NOT LIBSIGROK_DECODE_FOUND) set(WITH_SIGROK OFF) - message(STATUS "Libsigrokdecode not found") + message(NOTICE "Libsigrokdecode not found") endif() endif() diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index c92d451dbb..3b9025c1c6 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -113,7 +113,7 @@ find_package(KDDockWidgets QUIET) add_definitions(-DBOOST_ALL_DYN_LINK) find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED) -message(STATUS "Building " ${PROJECT_NAME}) +message(STATUS "Building: " ${PROJECT_NAME}) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) generate_export_header( diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt index d2bd5f5b2b..0c5a50d48b 100644 --- a/packages/CMakeLists.txt +++ b/packages/CMakeLists.txt @@ -35,10 +35,20 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") endif() include(PackageUtils) -set(ENABLE_PACKAGE_TEST-PLUGINS OFF) -set(ENABLE_PACKAGE_EXTPROC OFF) -if(DISABLE_ALL_PACKAGES) +if(DISABLE_ALL_PACKAGES MATCHES ON) enable_all_packages(${CMAKE_CURRENT_SOURCE_DIR} OFF) message(STATUS "DISABLE_ALL_PACKAGES is set.") +elseif(ENABLE_ALL_PACKAGES MATCHES ON) + enable_all_packages(${CMAKE_CURRENT_SOURCE_DIR} ON) + message(STATUS "ENABLE_ALL_PACKAGES is set.") +endif() + +# Default disabled packages +if(NOT DEFINED ENABLE_PACKAGE_TEST-PLUGINS) + set(ENABLE_PACKAGE_TEST-PLUGINS ON CACHE BOOL "Enable test plugins package" FORCE) +endif() + +if(NOT DEFINED ENABLE_PACKAGE_EXTPROC) + set(ENABLE_PACKAGE_EXTPROC ON CACHE BOOL "Enable extproc package" FORCE) endif() add_packages(${CMAKE_CURRENT_SOURCE_DIR} ${SCOPY_PACKAGE_BUILD_PATH}) diff --git a/packages/ad936x/CMakeLists.txt b/packages/ad936x/CMakeLists.txt index 251ff7641b..2212580750 100644 --- a/packages/ad936x/CMakeLists.txt +++ b/packages/ad936x/CMakeLists.txt @@ -27,14 +27,12 @@ set(PACKAGE_NAME ${SCOPY_MODULE}) set(PACKAGE_DISPLAY_NAME "AD936X") set(PACKAGE_DESCRIPTION "Plugin for AD936X") -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) include_emu_xml(${CMAKE_CURRENT_SOURCE_DIR}/emu-xml ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/emu-xml) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/ad936x/plugins/ad936x/CMakeLists.txt b/packages/ad936x/plugins/ad936x/CMakeLists.txt index 81b20aff7f..e709abf161 100644 --- a/packages/ad936x/plugins/ad936x/CMakeLists.txt +++ b/packages/ad936x/plugins/ad936x/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE ad936x) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_NAME AD936XPlugin) diff --git a/packages/apollo-ad9084/CMakeLists.txt b/packages/apollo-ad9084/CMakeLists.txt index 195366fe29..bc4bc8669c 100644 --- a/packages/apollo-ad9084/CMakeLists.txt +++ b/packages/apollo-ad9084/CMakeLists.txt @@ -27,14 +27,12 @@ set(PACKAGE_NAME ${SCOPY_MODULE}) set(PACKAGE_DISPLAY_NAME "Apollo AD9084") set(PACKAGE_DESCRIPTION "This package provides support for Apollo MXFE QUAD AD9084.") -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) include_emu_xml(${CMAKE_CURRENT_SOURCE_DIR}/emu-xml ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/emu-xml) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/apollo-ad9084/plugins/ad9084/CMakeLists.txt b/packages/apollo-ad9084/plugins/ad9084/CMakeLists.txt index 2618951f97..b306dd5994 100644 --- a/packages/apollo-ad9084/plugins/ad9084/CMakeLists.txt +++ b/packages/apollo-ad9084/plugins/ad9084/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE ad9084) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "AD9084") diff --git a/packages/generic-plugins/CMakeLists.txt b/packages/generic-plugins/CMakeLists.txt index ab2b4d60d5..f63516d917 100644 --- a/packages/generic-plugins/CMakeLists.txt +++ b/packages/generic-plugins/CMakeLists.txt @@ -27,8 +27,6 @@ set(PACKAGE_NAME ${SCOPY_MODULE}) set(PACKAGE_DISPLAY_NAME "Generic-Plugins") set(PACKAGE_DESCRIPTION "ADC, DAC, and others") -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) @@ -36,7 +34,7 @@ configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE} include_emu_xml(${CMAKE_CURRENT_SOURCE_DIR}/emu-xml ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/emu-xml) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/generic-plugins/plugins/adc/CMakeLists.txt b/packages/generic-plugins/plugins/adc/CMakeLists.txt index 22f8307e78..80bd45ebb0 100644 --- a/packages/generic-plugins/plugins/adc/CMakeLists.txt +++ b/packages/generic-plugins/plugins/adc/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE adc) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) include(GenerateExportHeader) diff --git a/packages/generic-plugins/plugins/dac/CMakeLists.txt b/packages/generic-plugins/plugins/dac/CMakeLists.txt index 7cb1ed73d2..1258ddbc98 100644 --- a/packages/generic-plugins/plugins/dac/CMakeLists.txt +++ b/packages/generic-plugins/plugins/dac/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE dac) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "DAC") diff --git a/packages/generic-plugins/plugins/datalogger/CMakeLists.txt b/packages/generic-plugins/plugins/datalogger/CMakeLists.txt index 907fd03b90..add4f255ce 100644 --- a/packages/generic-plugins/plugins/datalogger/CMakeLists.txt +++ b/packages/generic-plugins/plugins/datalogger/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE datalogger) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "Data logger") diff --git a/packages/generic-plugins/plugins/debugger/CMakeLists.txt b/packages/generic-plugins/plugins/debugger/CMakeLists.txt index ca8461e6d7..dde96517d2 100644 --- a/packages/generic-plugins/plugins/debugger/CMakeLists.txt +++ b/packages/generic-plugins/plugins/debugger/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE debugger) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "Debuger") diff --git a/packages/generic-plugins/plugins/jesdstatus/CMakeLists.txt b/packages/generic-plugins/plugins/jesdstatus/CMakeLists.txt index 84f9ca48a7..7c4811d941 100644 --- a/packages/generic-plugins/plugins/jesdstatus/CMakeLists.txt +++ b/packages/generic-plugins/plugins/jesdstatus/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE jesdstatus) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "JESDSTATUS") diff --git a/packages/generic-plugins/plugins/regmap/CMakeLists.txt b/packages/generic-plugins/plugins/regmap/CMakeLists.txt index dce6b3e11b..c84c9e8757 100644 --- a/packages/generic-plugins/plugins/regmap/CMakeLists.txt +++ b/packages/generic-plugins/plugins/regmap/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE regmap) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "Register map") diff --git a/packages/m2k/CMakeLists.txt b/packages/m2k/CMakeLists.txt index a1e3b30eee..252cb0e441 100644 --- a/packages/m2k/CMakeLists.txt +++ b/packages/m2k/CMakeLists.txt @@ -27,14 +27,12 @@ set(PACKAGE_NAME ${SCOPY_MODULE}) set(PACKAGE_DISPLAY_NAME "ADALM2000") set(PACKAGE_DESCRIPTION "Plugin for ADALM2000 (M2K).") -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) include_emu_xml(${CMAKE_CURRENT_SOURCE_DIR}/emu-xml ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/emu-xml) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/m2k/plugins/m2k/CMakeLists.txt b/packages/m2k/plugins/m2k/CMakeLists.txt index 76f7c5a951..b800b43e89 100644 --- a/packages/m2k/plugins/m2k/CMakeLists.txt +++ b/packages/m2k/plugins/m2k/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE m2k) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "ADALM2000") diff --git a/packages/m2k/plugins/m2k/m2k-gui/CMakeLists.txt b/packages/m2k/plugins/m2k/m2k-gui/CMakeLists.txt index 5756641c8a..acfbcb1dcf 100644 --- a/packages/m2k/plugins/m2k/m2k-gui/CMakeLists.txt +++ b/packages/m2k/plugins/m2k/m2k-gui/CMakeLists.txt @@ -80,7 +80,7 @@ else() /opt/local/lib64 REQUIRED ) - message("QWT LIBRARIES: " ${QWT_LIBRARIES}) + message(STATUS "QWT LIBRARIES: " ${QWT_LIBRARIES}) endif() diff --git a/packages/pqmon/CMakeLists.txt b/packages/pqmon/CMakeLists.txt index 8b06e20461..20a1b5bd79 100644 --- a/packages/pqmon/CMakeLists.txt +++ b/packages/pqmon/CMakeLists.txt @@ -27,8 +27,6 @@ set(PACKAGE_NAME ${SCOPY_MODULE}) set(PACKAGE_DISPLAY_NAME "PQMON") set(PACKAGE_DESCRIPTION "Power Quality Monitor (PQM) plugin.") -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) @@ -36,7 +34,7 @@ configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE} include_emu_xml(${CMAKE_CURRENT_SOURCE_DIR}/emu-xml ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/emu-xml) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/pqmon/plugins/pqm/CMakeLists.txt b/packages/pqmon/plugins/pqm/CMakeLists.txt index 3741f430cf..1271d6f0ad 100644 --- a/packages/pqmon/plugins/pqm/CMakeLists.txt +++ b/packages/pqmon/plugins/pqm/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE pqm) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "PQM") diff --git a/packages/swiot/CMakeLists.txt b/packages/swiot/CMakeLists.txt index 279f92b4ac..ba5f49dedf 100644 --- a/packages/swiot/CMakeLists.txt +++ b/packages/swiot/CMakeLists.txt @@ -27,14 +27,12 @@ set(PACKAGE_NAME ${SCOPY_MODULE}) set(PACKAGE_DISPLAY_NAME "AD-SWIOT1L-SL") set(PACKAGE_DESCRIPTION "Plugin for AD-SWIOT1L-SL.") -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) include_emu_xml(${CMAKE_CURRENT_SOURCE_DIR}/emu-xml ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/emu-xml) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/swiot/plugins/swiot/CMakeLists.txt b/packages/swiot/plugins/swiot/CMakeLists.txt index bc8e44a08d..9e8c8de4a5 100644 --- a/packages/swiot/plugins/swiot/CMakeLists.txt +++ b/packages/swiot/plugins/swiot/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE swiot) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME "AD-SWIOT1L-SL") diff --git a/packages/test-plugins/CMakeLists.txt b/packages/test-plugins/CMakeLists.txt index 2da2a04230..3e857f7ef2 100644 --- a/packages/test-plugins/CMakeLists.txt +++ b/packages/test-plugins/CMakeLists.txt @@ -24,13 +24,11 @@ set(SCOPY_MODULE test-plugins) set(CURRENT_PKG_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(PACKAGE_NAME ${SCOPY_MODULE}) -message(STATUS "building package: " ${SCOPY_MODULE}) - project(scopy-package-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) configure_file(manifest.json.cmakein ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/MANIFEST.json @ONLY) include_resources(${CMAKE_CURRENT_SOURCE_DIR}/resources ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugins) add_plugins(${CMAKE_CURRENT_SOURCE_DIR}/plugins ${SCOPY_PACKAGE_BUILD_PATH}/${SCOPY_MODULE}/plugins) install_plugins( diff --git a/packages/test-plugins/plugins/bareminimum/CMakeLists.txt b/packages/test-plugins/plugins/bareminimum/CMakeLists.txt index 05f160cd09..ca648cf65d 100644 --- a/packages/test-plugins/plugins/bareminimum/CMakeLists.txt +++ b/packages/test-plugins/plugins/bareminimum/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE bareminimum) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) include(GenerateExportHeader) diff --git a/packages/test-plugins/plugins/guitest/CMakeLists.txt b/packages/test-plugins/plugins/guitest/CMakeLists.txt index da5911858f..e9dadd0fe6 100644 --- a/packages/test-plugins/plugins/guitest/CMakeLists.txt +++ b/packages/test-plugins/plugins/guitest/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE guitest) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) include(GenerateExportHeader) diff --git a/packages/test-plugins/plugins/test/CMakeLists.txt b/packages/test-plugins/plugins/test/CMakeLists.txt index 961a2ecaeb..e3f7b652cd 100644 --- a/packages/test-plugins/plugins/test/CMakeLists.txt +++ b/packages/test-plugins/plugins/test/CMakeLists.txt @@ -22,8 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE test) -message(STATUS "building plugin: " ${SCOPY_MODULE}) - project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) include(GenerateExportHeader) diff --git a/packages/test-plugins/plugins/test2/CMakeLists.txt b/packages/test-plugins/plugins/test2/CMakeLists.txt index 88a91ab50a..3a6a3897cb 100644 --- a/packages/test-plugins/plugins/test2/CMakeLists.txt +++ b/packages/test-plugins/plugins/test2/CMakeLists.txt @@ -22,7 +22,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE test2) -message(STATUS "building plugin: " ${SCOPY_MODULE}) project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) include(GenerateExportHeader) diff --git a/tools/packagegenerator/templates/package/pkg_cmakelists.mako b/tools/packagegenerator/templates/package/pkg_cmakelists.mako index 05bffadb66..5456f54e79 100644 --- a/tools/packagegenerator/templates/package/pkg_cmakelists.mako +++ b/tools/packagegenerator/templates/package/pkg_cmakelists.mako @@ -4,8 +4,6 @@ set(SCOPY_MODULE ${id}) set(CURRENT_PKG_PATH ${"${CMAKE_CURRENT_SOURCE_DIR}"}) set(PACKAGE_NAME ${"${SCOPY_MODULE}"}) -message(STATUS "building package: " ${"${SCOPY_MODULE}"}) - project(scopy-package-${"${SCOPY_MODULE}"} VERSION 0.1 LANGUAGES CXX) configure_file( @@ -13,12 +11,12 @@ configure_file( ${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${SCOPY_MODULE}"}/MANIFEST.json @ONLY ) %if en_style: -message("Generate pkg style") +message(STATUS "Generate pkg style") include(ScopyStyle) generate_style("--core" ${"${CMAKE_CURRENT_SOURCE_DIR}"}/style ${"${CMAKE_CURRENT_SOURCE_DIR}"}/include/${"${SCOPY_MODULE}"} ${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${SCOPY_MODULE}"}) %endif %if en_translation: -message("Generate pkg translations") +message(STATUS "Generate pkg translations") include(ScopyTranslation) if(ENABLE_TRANSLATION) generate_translations(${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${SCOPY_MODULE}"}/translations) @@ -29,7 +27,7 @@ endif() include_emu_xml(${"${CMAKE_CURRENT_SOURCE_DIR}"}/emu-xml ${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${SCOPY_MODULE}"}/emu-xml) %endif include_resources(${"${CMAKE_CURRENT_SOURCE_DIR}"}/resources ${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${SCOPY_MODULE}"}/resources) -message("Including plugins") +message(STATUS "Including plugins for ${SCOPY_MODULE}") if(EXISTS ${"${CMAKE_CURRENT_SOURCE_DIR}"}/plugins) add_plugins(${"${CMAKE_CURRENT_SOURCE_DIR}"}/plugins ${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${SCOPY_MODULE}"}/plugins) install_plugins( diff --git a/tools/packagegenerator/templates/pdk/pdk_cmake_module.mako b/tools/packagegenerator/templates/pdk/pdk_cmake_module.mako index 1ffb4998c5..8991facc1b 100644 --- a/tools/packagegenerator/templates/pdk/pdk_cmake_module.mako +++ b/tools/packagegenerator/templates/pdk/pdk_cmake_module.mako @@ -6,7 +6,7 @@ function(inlcude_dirs root_dir) foreach(item ${"${all_items}"}) # Check if the item is a directory if(IS_DIRECTORY ${"${item}"}) - message(${"${item}"}) + message(STATUS ${"${item}"}) target_include_directories(${"${PROJECT_NAME}"} PRIVATE ${"${item}"}) endif() endforeach() @@ -19,7 +19,7 @@ function(link_libs root_dir) # Loop through each library found foreach(lib ${"${all_libs}"}) # Link libraries - message(${"${lib}"}) + message(STATUS ${"${lib}"}) target_link_libraries(${"${PROJECT_NAME}"} PRIVATE ${"${lib}"}) endforeach() endfunction() \ No newline at end of file diff --git a/tools/packagegenerator/templates/plugin/cmakelists.mako b/tools/packagegenerator/templates/plugin/cmakelists.mako index 5cd8aa28d3..c35610a4bf 100644 --- a/tools/packagegenerator/templates/plugin/cmakelists.mako +++ b/tools/packagegenerator/templates/plugin/cmakelists.mako @@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.9) set(SCOPY_MODULE ${scopy_module}) -message(STATUS "building plugin: " ${"${SCOPY_MODULE}"}) - project(scopy-${"${SCOPY_MODULE}"} VERSION 0.1 LANGUAGES CXX) set(PLUGIN_DISPLAY_NAME ${plugin_display_name.upper()}) @@ -58,7 +56,7 @@ generate_export_header( ) %if not pdk_en and (style_qss or style_json): -message("Generate plugin style:") +message(STATUS "Generate plugin style:") include(ScopyStyle) %if style_qss: file(MAKE_DIRECTORY ${"${SCOPY_PACKAGE_BUILD_PATH}"}/${"${PACKAGE_NAME}"}/style/qss)