admt: Format C++ and CMakeLists

Signed-off-by: John Lloyd Juanillo <[email protected]>

Author: JJuanill

CMakeLists.txt

@@ -302,4 +302,4 @@ set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_SET_DESTDIR ON)
 set(CPACK_COMPONENTS_ALL ${SCOPY_PDK})
-include(CPack)
+include(CPack)

plugins/admt/CMakeLists.txt

@@ -24,83 +24,90 @@ set(SCOPY_MODULE admt)
 
 message(STATUS "building plugin: " ${SCOPY_MODULE})
 
-project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) 
+project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
 set(PLUGIN_DISPLAY_NAME "ADMT")
 set(PLUGIN_DESCRIPTION "Plugin for ADMT Harmonic Calibration")
 
-include(GenerateExportHeader) 
+include(GenerateExportHeader)
 
 # TODO: split stylesheet/resources and add here TODO: export header files correctly
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON) 
+set(CMAKE_CXX_STANDARD 20)
+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
-    src/widgets/*.cpp
-) 
+	GLOB
+	SRC_LIST
+	src/*.cpp
+	src/*.cc
+	src/widgets/*.cpp
+)
 file(
-    GLOB 
-    HEADER_LIST 
-    include/${SCOPY_MODULE}/*.h 
-    include/${SCOPY_MODULE}/*.hpp
-    include/${SCOPY_MODULE}/widgets/*.h
+	GLOB
+	HEADER_LIST
+	include/${SCOPY_MODULE}/*.h
+	include/${SCOPY_MODULE}/*.hpp
+	include/${SCOPY_MODULE}/widgets/*.h
 )
 
 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})
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core)
 
-set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST}) 
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS REQUIRED Widgets Core) 
+qt_add_resources(PROJECT_RESOURCES res/resources.qrc)
 
-qt_add_resources(PROJECT_RESOURCES res/resources.qrc) 
-add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES}) 
+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
 )
 
 include(ScopyStyle)
 generate_style("--plugin" ${CMAKE_CURRENT_SOURCE_DIR}/style ${CMAKE_CURRENT_SOURCE_DIR}/include/admt)
 
+set(INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE} ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE} ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/widgets
+)
+
 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 ${INCLUDE_DIRECTORIES})
 
-target_include_directories(${PROJECT_NAME} PUBLIC scopy-pluginbase scopy-gui) 
+target_include_directories(${PROJECT_NAME} PUBLIC scopy-pluginbase scopy-gui)
+target_include_directories(${PROJECT_NAME} PRIVATE ${IIO_INCLUDE_DIRS} scopy-gui scopy-iioutil)
 
-target_link_libraries( 
-    ${PROJECT_NAME} 
-    PUBLIC Qt::Widgets 
-        Qt::Core 
-        scopy-pluginbase 
-        scopy-gui 
-        scopy-iioutil
+target_link_libraries(
+	${PROJECT_NAME}
+	PUBLIC Qt::Widgets
+	       Qt::Core
+	       scopy-pluginbase
+	       scopy-gui
+	       scopy-iioutil
 )
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	set(INSTALLER_DESCRIPTION "${PLUGIN_DISPLAY_NAME} ${PLUGIN_DESCRIPTION}")
 	configureinstallersettings(${SCOPY_MODULE} ${INSTALLER_DESCRIPTION} TRUE)
 endif()
 
-set(ADMT_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)
+set(ADMT_TARGET_NAME ${PROJECT_NAME} PARENT_SCOPE)