dac: fixes and cmakelists formatting

Signed-off-by: AlexandraTrifan <[email protected]>
analogdevicesinc · Sep 26, 2024 · 6f145a2 · 6f145a2
1 parent feb11a4
commit 6f145a2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -90,7 +90,6 @@ if(ENABLE_PLUGIN_PQM)
 	list(APPEND PLUGINS ${PQM_TARGET_NAME})
 endif()
 
-
 if(ENABLE_PLUGIN_M2K)
 	if(NOT WITH_PYTHON)
 		message(STATUS "Python is disabled or not found, M2K plugin disabled")

diff --git a/plugins/dac/CMakeLists.txt b/plugins/dac/CMakeLists.txt
@@ -4,40 +4,40 @@ set(SCOPY_MODULE dac)
 
 message(STATUS "building plugin: " ${SCOPY_MODULE})
 
-project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) 
+project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
-include(GenerateExportHeader) 
+include(GenerateExportHeader)
 
 # TODO: split stylesheet/resources and add here TODO: export header files correctly
 
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON) 
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui) 
-set(CMAKE_AUTOUIC ON) 
-set(CMAKE_AUTOMOC ON) 
-set(CMAKE_AUTORCC ON) 
+set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON) 
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(CMAKE_CXX_VISIBILITY_PRESET hidden) 
-set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE) 
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
 
-file(GLOB SRC_LIST src/*.cpp src/*.cc) 
-file(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp) 
-file(GLOB UI_LIST ui/*.ui) 
+file(GLOB SRC_LIST src/*.cpp src/*.cc)
+file(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp)
+file(GLOB UI_LIST ui/*.ui)
 
 set(ENABLE_TESTING ON)
-if(ENABLE_TESTING) 
-    add_subdirectory(test) 
-endif() 
+if(ENABLE_TESTING)
+	add_subdirectory(test)
+endif()
 
-set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) 
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core) 
+set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST})
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core)
 
-if(NOT "${SCOPY_PLUGIN_BUILD_PATH}" STREQUAL "") 
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH}) 
-endif() 
+if(NOT "${SCOPY_PLUGIN_BUILD_PATH}" STREQUAL "")
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCOPY_PLUGIN_BUILD_PATH})
+endif()
 
 set(DAC_CSV_SYSTEM_PATH ${SCOPY_PLUGIN_INSTALL_PATH}/csv)
 set(DAC_CSV_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/csv)
@@ -48,33 +48,33 @@ foreach(_csv ${CSVS})
 	file(COPY ${_csv} DESTINATION ${DAC_CSV_BUILD_PATH})
 endforeach()
 
-qt_add_resources(PROJECT_RESOURCES res/resources.qrc) 
-add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) 
+qt_add_resources(PROJECT_RESOURCES res/resources.qrc)
+add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES})
 
-generate_export_header( 
-    ${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h 
+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}) 
+target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE})
 
-target_include_directories(${PROJECT_NAME} PUBLIC scopy-pluginbase scopy-gui) 
+target_include_directories(${PROJECT_NAME} PUBLIC scopy-pluginbase scopy-gui)
 
-target_link_libraries( 
-    ${PROJECT_NAME} 
-    PUBLIC Qt::Widgets 
-        Qt::Core 
-        scopy-pluginbase 
-        scopy-gui 
-	scopy-iioutil
-	scopy-iio-widgets
+target_link_libraries(
+	${PROJECT_NAME}
+	PUBLIC Qt::Widgets
+	       Qt::Core
+	       scopy-pluginbase
+	       scopy-gui
+	       scopy-iioutil
+	       scopy-iio-widgets
 )
 
-set(PLUGIN_NAME ${PROJECT_NAME} PARENT_SCOPE) 
+set(PLUGIN_NAME ${PROJECT_NAME} PARENT_SCOPE)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${SCOPY_PLUGIN_INSTALL_DIR})
diff --git a/plugins/dac/src/bufferdacaddon.cpp b/plugins/dac/src/bufferdacaddon.cpp
@@ -16,6 +16,7 @@
 #include <iio-widgets/datastrategy/channelattrdatastrategy.h>
 
 #include <QDateTime>
+#include <QCoreApplication>
 #include <QHBoxLayout>
 #include <QFileDialog>
 #include <QString>

diff --git a/plugins/dac/test/CMakeLists.txt b/plugins/dac/test/CMakeLists.txt
@@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 3.5)
 
 include(ScopyTest)
 
-setup_scopy_tests(pluginloader)
+setup_scopy_tests(pluginloader)
diff --git a/windows/scopy-64.iss.cmakein b/windows/scopy-64.iss.cmakein
@@ -287,7 +287,7 @@ Source: "{#DestFolder}\*.dll"; DestDir: "{app}"; Components: main; Flags: ignore
 Source: "{#DestFolder}\qt.conf"; DestDir: "{app}"; Components: main; Flags: ignoreversion onlyifdoesntexist
 //Plugins
 Source: "{#DestFolder}\plugins\plugins\xmls\*"; DestDir: "{app}\plugins\plugins\xmls"; Components: main; Flags: ignoreversion skipifsourcedoesntexist recursesubdirs createallsubdirs onlyifdoesntexist
-Source: "{#DestFolder}\plugins\plugins\csv\*"; DestDir: "{app}\plugins\plugins\csv"; Components: main; Flags: ignoreversion skipifsourcedoesntexist recursesubdirs createallsubdirs onlyifdoesntexist
+Source: "{#DestFolder}\plugins\csv\*"; DestDir: "{app}\plugins\csv"; Components: main; Flags: ignoreversion skipifsourcedoesntexist recursesubdirs createallsubdirs onlyifdoesntexist
 @PLUGIN_COMPONENTS_FILES@
 
 [Tasks]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 3.5)

		include(ScopyTest)

		setup_scopy_tests(pluginloader)
		setup_scopy_tests(pluginloader)