From f91b98a07ce721576df287c83b62739121b9429c Mon Sep 17 00:00:00 2001
From: xc <xc@xyiege.com>
Date: Sun, 28 Sep 2025 15:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=AF=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scalib/CMakeLists.txt        |  5 +++++
 scalib/src/CMakeLists.txt    |  9 ++++----
 scalib/test_cmake_config.cmd | 40 ++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 scalib/test_cmake_config.cmd

diff --git a/scalib/CMakeLists.txt b/scalib/CMakeLists.txt
index 51a13aa..869ac73 100644
--- a/scalib/CMakeLists.txt
+++ b/scalib/CMakeLists.txt
@@ -8,6 +8,11 @@ project(rpc_client VERSION 1.0 LANGUAGES C)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
+# 设置生成文件输出目录
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+
 # 输出编译信息
 message(STATUS "Project: ${PROJECT_NAME}")
 message(STATUS "Version: ${PROJECT_VERSION}")
diff --git a/scalib/src/CMakeLists.txt b/scalib/src/CMakeLists.txt
index 2e3e5fa..16b9120 100644
--- a/scalib/src/CMakeLists.txt
+++ b/scalib/src/CMakeLists.txt
@@ -1,7 +1,8 @@
-# 设置输出目录
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+# 输出目录设置由顶层CMakeLists.txt控制
+# 以下设置已被禁用，使用顶层设置
+# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+# set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+# set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 # RPC共享库
 add_library(rpc_common STATIC
diff --git a/scalib/test_cmake_config.cmd b/scalib/test_cmake_config.cmd
new file mode 100644
index 0000000..090c73f
--- /dev/null
+++ b/scalib/test_cmake_config.cmd
@@ -0,0 +1,40 @@
+@echo off
+REM 测试CMake配置的脚本
+
+REM 设置构建目录
+set BUILD_DIR=build_test
+
+REM 清理旧的构建目录
+if exist %BUILD_DIR% rmdir /s /q %BUILD_DIR%
+
+REM 创建构建目录
+mkdir %BUILD_DIR%
+
+REM 运行CMake配置
+pushd %BUILD_DIR%
+cmake ..
+if %ERRORLEVEL% neq 0 (
+    echo CMake配置失败！
+    popd
+    exit /b 1
+)
+
+REM 构建项目
+cmake --build . --config Release
+if %ERRORLEVEL% neq 0 (
+    echo 构建失败！
+    popd
+    exit /b 1
+)
+
+popd
+
+REM 检查bin目录是否存在
+if exist bin (
+    echo bin目录已创建
+    dir bin
+) else (
+    echo bin目录未创建
+)
+
+pause
\ No newline at end of file