From 4c11ea0639b923a171e72a47b8006734ba184b3e Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周二, 15 4月 2025 18:47:46 +0800
Subject: [PATCH] 同步修改前的原SCPI库
---
CMakeLists.txt | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0826c6e..6b54d66 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})
@@ -12,6 +20,14 @@
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libscpi/inc>"
)
+
+target_link_libraries(scpi_static PRIVATE Qt::Core)
+
+# if(MSVC)
+# target_compile_options(scpi_static PRIVATE /TP)
+# endif()
+
+project(scpi_static LANGUAGES CXX)
# add_library(scpi SHARED ${SRC_FILES})
@@ -26,19 +42,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