From a6dedec1adeeb974bceb1930cb63178d6165c7f6 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周三, 16 4月 2025 09:53:34 +0800
Subject: [PATCH] 使用了scpi-def的cpp版本

---
 CMakeLists.txt |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0826c6e..58b4f6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,16 @@
 
 file(GLOB_RECURSE SRC_FILES
     libscpi/inc/*.h
-    libscpi/src/*.c
+	libscpi/src/*.c
+	libscpi/src/*.h
+	libscpi/src/*.cpp
 )
+
+
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core)
+set_source_files_properties(" libscpi/src/test-interactive.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
 
 add_library(scpi_static STATIC ${SRC_FILES})
 
@@ -13,12 +21,11 @@
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libscpi/inc>"
 )
 
-# add_library(scpi SHARED ${SRC_FILES})
+target_link_libraries(scpi_static PRIVATE Qt::Core)
 
-# target_include_directories(scpi
-#     PUBLIC
-#         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libscpi/inc>"
-# )
+project(scpi_static LANGUAGES CXX)
+
+
 
 enable_testing()
 find_package(unofficial-cunit CONFIG REQUIRED)
@@ -26,19 +33,4 @@
 file(GLOB_RECURSE TEST_FILES
     libscpi/test/*.c
 )
-foreach(test_file IN LISTS TEST_FILES)
-    cmake_path(GET test_file FILENAME test_name)
 
-    add_executable(${test_name} ${test_file})
-
-    target_link_libraries(${test_name} 
-        PRIVATE 
-            scpi_static
-            unofficial::cunit::cunit
-    )
-
-    add_test(
-        NAME "${test_name}"
-        COMMAND ${test_name}
-    )
-endforeach()

--
Gitblit v1.9.1