generic: cmake variables

Variables for windows installer Variables for using in the application added in configuration file of each plugin Signed-off-by: Ionut Muthi <[email protected]>
analogdevicesinc · Jun 12, 2024 · fa26b6a · fa26b6a
1 parent a8188bd
commit fa26b6a
Show file tree

Hide file tree

Showing 30 changed files with 204 additions and 636 deletions.
diff --git a/cmake/Modules/ScopyWindows.cmake b/cmake/Modules/ScopyWindows.cmake
@@ -7,8 +7,6 @@ set(__INCLUDED_SCOPY_WINDOWS_CMAKE TRUE)
 set(ENV_WORKDIR $ENV{WORKDIR})
 set(ENV_DEST_FOLDER $ENV{DEST_FOLDER})
 
-configure_file(windows/scopy.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/windows/scopy.iss @ONLY)
-configure_file(windows/scopy-32.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/windows/scopy-32.iss @ONLY)
 configure_file(windows/scopy-64.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/windows/scopy-64.iss @ONLY)
 
 macro(duplicate_target ORIGINAL NEW)

diff --git a/cmake/Modules/ScopyWindowsInstaller.cmake b/cmake/Modules/ScopyWindowsInstaller.cmake
@@ -0,0 +1,17 @@
+set(PLUGIN_COMPONENTS "" CACHE STRING "PLUGIN COMPONENTS FOR WINDOWS INSTALLER" FORCE)
+set(PLUGIN_COMPONENTS_FILES "" CACHE STRING "PLUGIN COMPONENTS FILES FOR WINDOWS INSTALLER" FORCE)
+
+function(ConfigureInstallerSettings PLUGIN_TARGET_NAME PLUGIN_INSTALLER_DESCRIPTION FIXED_INSTALLER_OPTION )
+	set(SELECTABLE "Flags: disablenouninstallwarning")
+	if(${FIXED_INSTALLER_OPTION} MATCHES FALSE)
+		set(SELECTABLE "compact custom ; Flags: fixed")
+	endif()
+	set(PLUGIN_COMPONENTS
+	    "${PLUGIN_COMPONENTS} \n Name: \"plugins/${PLUGIN_TARGET_NAME}\"; Description: ${PLUGIN_INSTALLER_DESCRIPTION} ; Types: full plugins ${SELECTABLE} ;"
+	    CACHE STRING "PLUGIN COMPONENTS FOR WINDOWS INSTALLER" FORCE
+	)
+	set(PLUGIN_COMPONENTS_FILES
+	    "${PLUGIN_COMPONENTS_FILES} \n Source:\"{#DestFolder}\\plugins\\plugins\\libscopy-${PLUGIN_TARGET_NAME}.dll\"; DestDir: \"{app}\\plugins\\plugins\"; Components: plugins\\${PLUGIN_TARGET_NAME}; Flags: ignoreversion skipifsourcedoesntexist onlyifdoesntexist ;"
+	    CACHE STRING "PLUGIN COMPONENTS FILES FOR WINDOWS INSTALLER" FORCE
+	)
+endfunction()
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -14,10 +14,6 @@ option(ENABLE_PLUGIN_PQM "Enable PQM plugin" ON)
 option(ENABLE_PLUGIN_DATALOGGER "Enable DATALOGGER plugin" ON)
 option(ENABLE_PLUGIN_IIODEBUGPLUGIN "Enable IIODEBUGPLUGIN plugin" ON)
 
-set(PLUGIN_COMPONENTS "")
-set(PLUGIN_COMPONENTS_FILES "")
-
-<<<<<<< HEAD
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH})
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -26,27 +22,13 @@ 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})
-=======
-function(ConfigureInstallerSettings PROJECT_NAME PLUGIN_NAME PLUGIN_DESCRIPTION FIXED)
->>>>>>> generic: plugins CMAKE variables
-
-	set(PLUGIN_COMPONENTS
-	    ${PLUGIN_COMPONENTS}
-	    "\n Name: \"plugins/${PROJECT_NAME}\"; Description: ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} ; Types: full plugins; Flags: ${FIXED} "
-	    PARENT_SCOPE
-	)
-	set(PLUGIN_COMPONENTS_FILES
-	    ${PLUGIN_COMPONENTS_FILES}
-	    "\n Source:\"{#DestFolder}\\plugins\\plugins\\libscopy-${PROJECT_NAME}.dll\"; DestDir: \"{app}\\plugins\\plugins\"; Components: plugins\\${PROJECT_NAME}; Flags: ignoreversion skipifsourcedoesntexist onlyifdoesntexist"
-	    PARENT_SCOPE
-	)
-endfunction()
-
 # The order the plugins are added here will also affect the installer order. Make sure fixed plugin are before optional
 # ones.
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	include(ScopyWindowsInstaller)
+endif()
+
 if(ENABLE_PLUGIN_TEST)
 	add_subdirectory(guitest)
 	list(APPEND PLUGINS ${PLUGIN_NAME})
@@ -75,44 +57,37 @@ endif()
 
 if(ENABLE_PLUGIN_ADC)
 	add_subdirectory(adc)
-	list(APPEND PLUGINS ${PROJECT_NAME})
-	configureinstallersettings(${PLUGIN_SHORT_NAME} ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "fixed")
+	list(APPEND PLUGINS ${ADC_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_REGMAP)
 	add_subdirectory(regmap)
-	list(APPEND PLUGINS ${PROJECT_NAME})
-	configureinstallersettings(${PLUGIN_SHORT_NAME}  ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "fixed")
+	list(APPEND PLUGINS ${REGNMAP_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_DEBUGGER)
 	add_subdirectory(debugger)
-	list(APPEND PLUGINS ${PROJECT_NAME})
-	configureinstallersettings(${PLUGIN_SHORT_NAME} ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "fixed")
+	list(APPEND PLUGINS ${DEBUGGER_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_IIODEBUGPLUGIN)
 	add_subdirectory(iiodebug)
-	list(APPEND PLUGINS ${PLUGIN_NAME})
-	configureinstallersettings(${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "fixed")
+	list(APPEND PLUGINS ${IIODEBUG_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_DATALOGGER)
 	add_subdirectory(datalogger)
-	list(APPEND PLUGINS ${PROJECT_NAME})
-	configureinstallersettings(${PLUGIN_SHORT_NAME} ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "fixed")
+	list(APPEND PLUGINS ${DATALOGGER_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_SWIOT)
 	add_subdirectory(swiot)
-	list(APPEND PLUGINS ${PROJECT_NAME})
-	configureinstallersettings(${PLUGIN_SHORT_NAME} ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "disablenouninstallwarning" )
+	list(APPEND PLUGINS ${SWIOT_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_PQM)
 	add_subdirectory(pqm)
-	list(APPEND PLUGINS ${PROJECT_NAME})
-	configureinstallersettings(${PLUGIN_SHORT_NAME} ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION} "disablenouninstallwarning" )
+	list(APPEND PLUGINS ${PQM_TARGET_NAME})
 endif()
 
 if(ENABLE_PLUGIN_M2K)
@@ -126,21 +101,10 @@ if(ENABLE_PLUGIN_M2K)
 
 	if(WITH_SIGROK AND WITH_PYTHON)
 		add_subdirectory(m2k)
-		list(APPEND PLUGINS ${PROJECT_NAME})
-		configureinstallersettings(${PLUGIN_SHORT_NAME} ${PLUGIN_NAME} ${PLUGIN_DESCRIPTION}  "disablenouninstallwarning")
+		list(APPEND PLUGINS ${M2K_TARGET_NAME})
 	endif()
 endif()
 
-if(ENABLE_PLUGIN_DATAMONITOR)
-	add_subdirectory(datamonitor)
-	list(APPEND PLUGINS ${PLUGIN_NAME})
-endif()
-
-if(ENABLE_PLUGIN_IIODEBUGPLUGIN)
-	add_subdirectory(iiodebugplugin)
-	list(APPEND PLUGINS ${PLUGIN_NAME})
-endif()
-
 set(PLUGINS ${PLUGINS} PARENT_SCOPE)
 set(PLUGIN_COMPONENTS ${PLUGIN_COMPONENTS} PARENT_SCOPE)
 set(PLUGIN_COMPONENTS_FILES ${PLUGIN_COMPONENTS_FILES} PARENT_SCOPE)

diff --git a/plugins/adc/.gitignore b/plugins/adc/.gitignore
@@ -1 +1,2 @@
 include/adc/scopy-adc_export.h
+include/adc/scopy-adc_config.h
diff --git a/plugins/adc/CMakeLists.txt b/plugins/adc/CMakeLists.txt
@@ -6,9 +6,8 @@ message(STATUS "building plugin: " ${SCOPY_MODULE})
 
 project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
-set(PLUGIN_NAME "ADC")
-set(PLUGIN_DESCRIPTION "Analog to Digital Convertor")
-
+set(PLUGIN_DISPLAY_NAME "ADC")
+set(PLUGIN_DESCRIPTION "Analog to Digital Converter")
 
 include(GenerateExportHeader)
 
@@ -46,6 +45,11 @@ generate_export_header(
 	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h
 )
 
+configure_file(
+	include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h.cmakein
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h @ONLY
+)
+
 target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE})
 
@@ -61,9 +65,11 @@ target_link_libraries(
 	       scopy-iio-widgets
 )
 
-set(PROJECT_NAME ${PROJECT_NAME} PARENT_SCOPE)
-set(PLUGIN_NAME ${PLUGIN_NAME} PARENT_SCOPE)
-set(PLUGIN_SHORT_NAME ${SCOPY_MODULE} PARENT_SCOPE)
-set(PLUGIN_DESCRIPTION ${PLUGIN_DESCRIPTION} PARENT_SCOPE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set(INSTALLER_DESCRIPTION "${PLUGIN_DISPLAY_NAME} ${PLUGIN_DESCRIPTION}")
+	configureinstallersettings(${SCOPY_MODULE} ${INSTALLER_DESCRIPTION} FALSE)
+endif()
+
+set(ADC_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${SCOPY_PLUGIN_INSTALL_DIR})
diff --git a/plugins/adc/include/adc/scopy-adc_config.h.cmakein b/plugins/adc/include/adc/scopy-adc_config.h.cmakein
@@ -0,0 +1,11 @@
+#ifndef SCOPY_ADC_CONFIG_H_CMAKEIN
+#define SCOPY_ADC_CONFIG_H_CMAKEIN
+
+#define ADC_PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
+#define ADC_PLUGIN_SCOPY_MODULE "@SCOPY_MODULE@"
+#define ADC_PLUGIN_DESCRIPTION "@PLUGIN_DESCRIPTION@"
+
+#cmakedefine ENABLE_SCOPYJS
+
+#endif // SCOPY_ADC_CONFIG_H_CMAKEIN
+
diff --git a/plugins/datalogger/.gitignore b/plugins/datalogger/.gitignore
@@ -1 +1,2 @@
 include/datalogger/scopy-datalogger_export.h
+include/datalogger/scopy-datalogger_config.h
diff --git a/plugins/datalogger/CMakeLists.txt b/plugins/datalogger/CMakeLists.txt
@@ -6,10 +6,9 @@ message(STATUS "building plugin: " ${SCOPY_MODULE})
 
 project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
-set(PLUGIN_NAME "Data logger")
+set(PLUGIN_DISPLAY_NAME "Data logger")
 set(PLUGIN_DESCRIPTION "Used to monitor and log data")
 
-
 include(GenerateExportHeader)
 
 # TODO: split stylesheet/resources and add here TODO: export header files correctly
@@ -66,6 +65,11 @@ generate_export_header(
 	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h
 )
 
+configure_file(
+	include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h.cmakein
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h @ONLY
+)
+
 set(INCLUDE_DIRECTORIES
     ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE} ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/menus
     ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/datamonitor
@@ -88,9 +92,11 @@ target_link_libraries(
 	       scopy-iio-widgets
 )
 
-set(PROJECT_NAME ${PROJECT_NAME} PARENT_SCOPE)
-set(PLUGIN_NAME ${PLUGIN_NAME} PARENT_SCOPE)
-set(PLUGIN_SHORT_NAME ${SCOPY_MODULE} PARENT_SCOPE)
-set(PLUGIN_DESCRIPTION ${PLUGIN_DESCRIPTION} PARENT_SCOPE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set(INSTALLER_DESCRIPTION "${PLUGIN_DISPLAY_NAME} ${PLUGIN_DESCRIPTION}")
+	configureinstallersettings(${SCOPY_MODULE} ${INSTALLER_DESCRIPTION} FALSE)
+endif()
+
+set(DATALOGGER_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${SCOPY_PLUGIN_INSTALL_DIR})
diff --git a/plugins/datalogger/include/datalogger/scopy-datalogger_config.h.cmakein b/plugins/datalogger/include/datalogger/scopy-datalogger_config.h.cmakein
@@ -0,0 +1,11 @@
+#ifndef SCOPY_DATALOGGER_CONFIG_H_CMAKEIN
+#define SCOPY_DATALOGGER_CONFIG_H_CMAKEIN
+
+#define DATALOGGER_PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
+#define DATALOGGER_PLUGIN_SCOPY_MODULE "@SCOPY_MODULE@"
+#define DATALOGGER_PLUGIN_DESCRIPTION "@PLUGIN_DESCRIPTION@"
+
+#cmakedefine ENABLE_SCOPYJS
+
+#endif // SCOPY_DATALOGGER_CONFIG_H_CMAKEIN
+
diff --git a/plugins/debugger/.gitignore b/plugins/debugger/.gitignore
@@ -1 +1,2 @@
 include/debugger/scopy-debugger_export.h
+include/debugger/scopy-debugger_config.h
diff --git a/plugins/debugger/CMakeLists.txt b/plugins/debugger/CMakeLists.txt
@@ -6,7 +6,7 @@ message(STATUS "building plugin: " ${SCOPY_MODULE})
 
 project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
-set(PLUGIN_NAME "Debuger")
+set(PLUGIN_DISPLAY_NAME "Debuger")
 set(PLUGIN_DESCRIPTION "Used to debug connected devices")
 
 include(GenerateExportHeader)
@@ -49,6 +49,11 @@ generate_export_header(
 	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h
 )
 
+configure_file(
+	include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h.cmakein
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h @ONLY
+)
+
 target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE})
 
@@ -67,7 +72,9 @@ target_link_libraries(
 	       scopy-core
 )
 
-set(PROJECT_NAME ${PROJECT_NAME} PARENT_SCOPE)
-set(PLUGIN_NAME ${PLUGIN_NAME} PARENT_SCOPE)
-set(PLUGIN_SHORT_NAME ${SCOPY_MODULE} PARENT_SCOPE)
-set(PLUGIN_DESCRIPTION ${PLUGIN_DESCRIPTION} PARENT_SCOPE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set(INSTALLER_DESCRIPTION "${PLUGIN_DISPLAY_NAME} ${PLUGIN_DESCRIPTION}")
+	configureinstallersettings(${SCOPY_MODULE} ${INSTALLER_DESCRIPTION} FALSE)
+endif()
+
+set(DEBUGGER_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
diff --git a/plugins/debugger/include/debugger/scopy-debugger_config.h.cmakein b/plugins/debugger/include/debugger/scopy-debugger_config.h.cmakein
@@ -0,0 +1,11 @@
+#ifndef SCOPY_DEBUGGER_CONFIG_H_CMAKEIN
+#define SCOPY_DEBUGGER_CONFIG_H_CMAKEIN
+
+#define DEBUGGER_PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
+#define DEBUGGER_PLUGIN_SCOPY_MODULE "@SCOPY_MODULE@"
+#define DEBUGGER_PLUGIN_DESCRIPTION "@PLUGIN_DESCRIPTION@"
+
+#cmakedefine ENABLE_SCOPYJS
+
+#endif // SCOPY_DEBUGGER_CONFIG_H_CMAKEIN
+
diff --git a/plugins/iiodebug/.gitignore b/plugins/iiodebug/.gitignore
@@ -1 +1,2 @@
 include/iiodebug/scopy-iiodebug_export.h
+include/iiodebug/scopy-iiodebug_config.h
diff --git a/plugins/iiodebug/CMakeLists.txt b/plugins/iiodebug/CMakeLists.txt
@@ -6,6 +6,9 @@ message(STATUS "building plugin: " ${SCOPY_MODULE})
 
 project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
+set(PLUGIN_DISPLAY_NAME "IIO Debug")
+set(PLUGIN_DESCRIPTION "Debugger for IIO")
+
 include(GenerateExportHeader)
 
 # TODO: split stylesheet/resources and add here TODO: export header files correctly
@@ -64,6 +67,10 @@ target_link_libraries(
 	       scopy-iio-widgets
 )
 
-set(PLUGIN_NAME ${PROJECT_NAME} PARENT_SCOPE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	configureinstallersettings(${SCOPY_MODULE} ${PLUGIN_DESCRIPTION} FALSE)
+endif()
+
+set(IIODEBUG_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${SCOPY_PLUGIN_INSTALL_DIR})
diff --git a/plugins/iiodebug/include/iiodebug/scopy-iiodebug_config.h.cmakein b/plugins/iiodebug/include/iiodebug/scopy-iiodebug_config.h.cmakein
@@ -0,0 +1,11 @@
+#ifndef SCOPY_IIODEBUG_CONFIG_H_CMAKEIN
+#define SCOPY_IIODEBUG_CONFIG_H_CMAKEIN
+
+#define IIODEBUG_PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
+#define IIODEBUG_PLUGIN_SCOPY_MODULE "@SCOPY_MODULE@"
+#define IIODEBUG_PLUGIN_DESCRIPTION "@PLUGIN_DESCRIPTION@"
+
+#cmakedefine ENABLE_SCOPYJS
+
+#endif // SCOPY_IIODEBUG_CONFIG_H_CMAKEIN
+
diff --git a/plugins/m2k/.gitignore b/plugins/m2k/.gitignore
@@ -1 +1,2 @@
 include/m2k/scopy-m2k_export.h
+include/m2k/scopy-m2k_config.h
diff --git a/plugins/m2k/CMakeLists.txt b/plugins/m2k/CMakeLists.txt
@@ -6,10 +6,9 @@ message(STATUS "building plugin: " ${SCOPY_MODULE})
 
 project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
-set(PLUGIN_NAME "ADALM2000")
+set(PLUGIN_DISPLAY_NAME "ADALM2000")
 set(PLUGIN_DESCRIPTION "Plugin for ADALM2000 (M2K)")
 
-
 include(GenerateExportHeader)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -83,6 +82,11 @@ generate_export_header(
 	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h
 )
 
+configure_file(
+	include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h.cmakein
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/scopy-${SCOPY_MODULE}_config.h @ONLY
+)
+
 target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(
 	${PROJECT_NAME}
@@ -122,7 +126,9 @@ target_link_libraries(
 	       gnuradio::gnuradio-m2k
 )
 
-set(PROJECT_NAME ${PROJECT_NAME} PARENT_SCOPE)
-set(PLUGIN_NAME ${PLUGIN_NAME} PARENT_SCOPE)
-set(PLUGIN_SHORT_NAME ${SCOPY_MODULE} PARENT_SCOPE)
-set(PLUGIN_DESCRIPTION ${PLUGIN_DESCRIPTION} PARENT_SCOPE)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set(INSTALLER_DESCRIPTION "${PLUGIN_DISPLAY_NAME} ${PLUGIN_DESCRIPTION}")
+	configureinstallersettings(${SCOPY_MODULE} ${INSTALLER_DESCRIPTION} "disablenouninstallwarning")
+endif()
+
+set(M2K_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
diff --git a/plugins/m2k/include/m2k/scopy-m2k_config.h.cmakein b/plugins/m2k/include/m2k/scopy-m2k_config.h.cmakein
@@ -0,0 +1,11 @@
+#ifndef SCOPY_M2K_CONFIG_H_CMAKEIN
+#define SCOPY_M2K_CONFIG_H_CMAKEIN
+
+#define M2K_PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
+#define M2K_PLUGIN_SCOPY_MODULE "@SCOPY_MODULE@"
+#define M2K_PLUGIN_DESCRIPTION "@PLUGIN_DESCRIPTION@"
+
+#cmakedefine ENABLE_SCOPYJS
+
+#endif // SCOPY_M2K_CONFIG_H_CMAKEIN
+
diff --git a/plugins/pqm/.gitignore b/plugins/pqm/.gitignore
@@ -1 +1,2 @@
 include/pqm/scopy-pqm_export.h
+include/pqm/scopy-pqm_config.h