Skip to content

Commit 166b981

Browse files
committed
fix: error
1 parent 9c864a8 commit 166b981

File tree

7 files changed

+26
-10
lines changed

7 files changed

+26
-10
lines changed

.github/workflows/cmake-unit-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ jobs:
4343
sudo apt-get update
4444
sudo apt-get install libsfml-dev
4545
sudo apt-get install cmake
46-
sudo apt-get install g++
46+
47+
- name: Check g++ version
48+
run: g++ --version
4749

4850
- name: Configure CMake
4951
run: |

Library/PAX_SAPIENTICA/Type/Vector2.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ namespace paxs {
9191
y /= t;
9292
return *this;
9393
}
94-
constexpr auto operator<=>(const Vector2<T>& v) const noexcept = default;
94+
auto operator<=>(const Vector2<T>& v) const noexcept = default;
9595

9696
/// @brief Get the length of the vector
9797
/// @brief べクトルの長さを取得。

Project/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.16)
22
project(PAX_SAPIENTICA)
33
include(CTest)
44
set(CMAKE_CXX_STANDARD 20)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
56

67
if(NOT CMAKE_BUILD_TYPE)
78
set(CMAKE_BUILD_TYPE Release)
@@ -27,16 +28,10 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
2728
endif()
2829
endif()
2930

30-
31-
get_filename_component(PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
32-
add_definitions(-DPROJECT_ROOT_PATH=\"${PARENT_DIR}\")
33-
3431
add_subdirectory(GeographicDataToSimulationGrid)
3532
add_subdirectory(IncludeTest)
3633
add_subdirectory(IntegrationTest)
3734
add_subdirectory(UnitTest)
3835

39-
add_subdirectory(../ExternalLibrary/googletest ${CMAKE_BINARY_DIR}/googletest)
40-
4136
enable_testing()
4237

Project/IncludeTest/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
cmake_minimum_required(VERSION 3.16)
2+
set(CMAKE_CXX_STANDARD 20)
3+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4+
15
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
26
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../Library)
37

Project/IntegrationTest/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
cmake_minimum_required(VERSION 3.16)
2+
set(CMAKE_CXX_STANDARD 20)
3+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4+
15
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
26
include_directories(
37
${CMAKE_CURRENT_SOURCE_DIR}/../../Library

Project/UnitTest/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1+
cmake_minimum_required(VERSION 3.16)
2+
set(CMAKE_CXX_STANDARD 20)
3+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4+
15
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
26
include_directories(
37
${CMAKE_CURRENT_SOURCE_DIR}/../../Library
48
${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include
59
)
610

11+
12+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest ${CMAKE_BINARY_DIR}/googletest)
13+
14+
15+
get_filename_component(PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
16+
add_definitions(-DPROJECT_ROOT_PATH=\"${PARENT_DIR}\")
17+
718
set(TEST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source")
819
920
file(GLOB_RECURSE TEST_SOURCES "${TEST_SOURCE_DIR}/*.cpp")

Scripts/CTest.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
SET SCRIPT_DIR=%~dp0
44

55
:: Create build directory
6-
cmake -S"%SCRIPT_DIR%..\Project" -B"%SCRIPT_DIR%..\build"
6+
cmake -S"%SCRIPT_DIR%..\Project" -B"%SCRIPT_DIR%..\build" -DCMAKE_BUILD_TYPE=Release
77

88
:: Build the project
99
cmake --build "%SCRIPT_DIR%..\build"
1010

1111
:: Change directory to build and execute ctest
1212
cd "%SCRIPT_DIR%..\build"
13-
ctest
13+
ctest -C Release

0 commit comments

Comments
 (0)