diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index a0495c2b4..c3f10e7d7 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -17,6 +17,14 @@ option(ENABLE_PLUGIN_IIODEBUGPLUGIN "Enable IIODEBUGPLUGIN plugin" ON) set(PLUGIN_COMPONENTS "") set(PLUGIN_COMPONENTS_FILES "") +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") +else() + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) +endif() + function(ConfigureInstallerSettings PLUGIN_NAME PLUGIN_DESCRIPTION FIXED) string(REPLACE "scopy-" "" AUX_PLUGIN ${PLUGIN_NAME}) diff --git a/plugins/adc/CMakeLists.txt b/plugins/adc/CMakeLists.txt index 493c17e05..e4cbb18a7 100644 --- a/plugins/adc/CMakeLists.txt +++ b/plugins/adc/CMakeLists.txt @@ -35,14 +35,6 @@ endif() set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - qt_add_resources(PROJECT_RESOURCES res/resources.qrc) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) diff --git a/plugins/datalogger/CMakeLists.txt b/plugins/datalogger/CMakeLists.txt index e3217ef09..1b5b21c3f 100644 --- a/plugins/datalogger/CMakeLists.txt +++ b/plugins/datalogger/CMakeLists.txt @@ -54,14 +54,6 @@ endif() set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - qt_add_resources(PROJECT_RESOURCES resources/resources.qrc ../../resources/resources.qrc) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) diff --git a/plugins/debugger/CMakeLists.txt b/plugins/debugger/CMakeLists.txt index 4f599f437..778ab1d05 100644 --- a/plugins/debugger/CMakeLists.txt +++ b/plugins/debugger/CMakeLists.txt @@ -38,14 +38,6 @@ set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${SCOPY_QT_COMPONENTS} REQUIRED) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - qt_add_resources(PROJECT_RESOURCES resources/resources.qrc ../../resources/resources.qrc) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) diff --git a/plugins/m2k/CMakeLists.txt b/plugins/m2k/CMakeLists.txt index 76b8eae89..e4a7689db 100644 --- a/plugins/m2k/CMakeLists.txt +++ b/plugins/m2k/CMakeLists.txt @@ -71,14 +71,6 @@ find_package( find_package(gnuradio-scopy REQUIRED PATH_SUFFIXES scopy) find_package(gnuradio-m2k REQUIRED PATH_SUFFIXES m2k) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - qt_add_resources(PROJECT_RESOURCES res/resources.qrc) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) diff --git a/plugins/pqm/CMakeLists.txt b/plugins/pqm/CMakeLists.txt index 03af147e6..074fa18fd 100644 --- a/plugins/pqm/CMakeLists.txt +++ b/plugins/pqm/CMakeLists.txt @@ -35,14 +35,6 @@ endif() set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core Concurrent) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - qt_add_resources(PROJECT_RESOURCES res/resources.qrc) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) diff --git a/plugins/regmap/CMakeLists.txt b/plugins/regmap/CMakeLists.txt index 4dde809ec..ed1a4fc84 100644 --- a/plugins/regmap/CMakeLists.txt +++ b/plugins/regmap/CMakeLists.txt @@ -55,14 +55,6 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${SCOPY_QT_COMPONENTS} REQUIRED) find_package(libm2k REQUIRED) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - set(REGMAP_XML_PATH ${CMAKE_INSTALL_FULL_DATADIR}/regmap) set(REGMAP_XML_SYSTEM_PATH ${REGMAP_XML_PATH}/xmls) set(REGMAP_XML_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/xmls) diff --git a/plugins/swiot/CMakeLists.txt b/plugins/swiot/CMakeLists.txt index 4d7e23abf..dec90042b 100644 --- a/plugins/swiot/CMakeLists.txt +++ b/plugins/swiot/CMakeLists.txt @@ -63,14 +63,6 @@ set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST}) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${SCOPY_QT_COMPONENTS} REQUIRED) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Scopy.app/Contents/MacOS/plugins/plugins") -else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) -endif() - qt_add_resources(PROJECT_RESOURCES res/resources.qrc ../../resources/resources.qrc) add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES})