Update build-aux setup scripts.

	修改：     .github/workflows/test.yml
	修改：     CMakeLists.txt
	修改：     setup.cmd
	修改：     setup.sh

Author: ChenPi11

.github/workflows/test.yml

@@ -21,18 +21,22 @@ jobs:
         sudo apt-get update
         sudo apt-get install gcc cmake -y
     
+    - name: Setup build-aux
+      run: |
+        ./setup.sh
+    
     #--------------------------------------------build--------------------------------------------
     - name: Build
       run : |
-        mkdir build
+        mkdir -p build
         cd build
         cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
+        cmake --build .
     
     #--------------------------------------------test--------------------------------------------
     - name: Test
       run : |
-        ctest --verbose --output-on-failure
-    
+        ctest --verbose
     
   test-macos:
 
@@ -46,7 +50,7 @@ jobs:
       run: |
         brew install cmake -y
     
-    - name: Setup repos
+    - name: Setup build-aux
       run : |
         ./setup.sh
     
@@ -56,8 +60,9 @@ jobs:
         mkdir build
         cd build
         cmake .. -DENABLE_EXTRA=ON -DENABLE_TEST=ON
+        cmake --build .
     
     #--------------------------------------------test--------------------------------------------
     - name: Test
       run : |
-        ctest --verbose --output-on-failure
+        ctest --verbose

CMakeLists.txt

@@ -24,7 +24,19 @@ option(ENABLE_EXTRA "Enable extra encodings and features." OFF)
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 11)
 
-include("${CMAKE_SOURCE_DIR}/build-aux/cmake/cppp.cmake")
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/build-aux")
+    set(BUILD_AUX "${CMAKE_CURRENT_SOURCE_DIR}/build-aux")
+elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../build-aux")
+    set(BUILD_AUX "${CMAKE_CURRENT_SOURCE_DIR}/../build-aux")
+else()
+    message(FATAL_ERROR "CMake build-aux directory is not exists, try to execute 'setup.cmd' or './setup.sh' to get it.")
+endif()
+set(AUX_DIR "${BUILD_AUX}/cmake")
+
+message(STATUS "Using '${BUILD_AUX}' for C++ Plus build-aux directory.")
+add_subdirectory("${BUILD_AUX}")
+
+include("${AUX_DIR}/cppp.cmake")
 
 check_have_visibility()
 

setup.cmd

@@ -31,7 +31,6 @@ if exist ..\build-aux (
 )
 
 echo Notice: '..\build-aux' for C++ Plus are not exists, cloning it......
-echo Notice: It will be cloned to '.\build-aux' and ignored by '.gitignore', if you 'git clean' this project, The '.\build-aux' may be deleted, and you will need to rerun this script to adapt to your environment at that time.
 git clone https://github.com/cppp-project/build-aux
 if %errorlevel%==0 (
     echo Success: '.\build-aux' cloned successfully, please don't remove it, and you can develop this package normally.

setup.sh

@@ -48,7 +48,6 @@ then
 fi
 
 text_out 0 "Notice" "'../build-aux' for C++ Plus are not exists, cloning it......"
-text_out 0 "Notice" "It will be cloned to './build-aux' and ignored by '.gitignore', if you 'git clean' this project, The './build-aux' may be deleted, and you will need to rerun this script to adapt to your environment at that time."
 execute "git clone https://github.com/cppp-project/build-aux"
 if [ $? -eq 0 ]
 then