Skip to content

Commit 09c675f

Browse files
committed
fix: error
1 parent d319a06 commit 09c675f

File tree

8 files changed

+39
-13
lines changed

8 files changed

+39
-13
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 & 7 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,17 +28,10 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
2728
endif()
2829
endif()
2930

30-
include_directories(${CMAKE_SOURCE_DIR}/../Library)
31-
32-
get_filename_component(PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
33-
add_definitions(-DPROJECT_ROOT_PATH=\"${PARENT_DIR}\")
34-
3531
add_subdirectory(GeographicDataToSimulationGrid)
3632
add_subdirectory(IncludeTest)
3733
add_subdirectory(IntegrationTest)
3834
add_subdirectory(UnitTest)
3935

40-
add_subdirectory(../ExternalLibrary/googletest ${CMAKE_BINARY_DIR}/googletest)
41-
4236
enable_testing()
4337

Project/IncludeTest/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
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)
6+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../Library)
27

38
file(GLOB_RECURSE LIB_HEADERS RELATIVE "${CMAKE_SOURCE_DIR}/../Library" "${CMAKE_SOURCE_DIR}/../Library/*.hpp")
49

Project/IntegrationTest/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
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)
2-
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include)
6+
include_directories(
7+
${CMAKE_CURRENT_SOURCE_DIR}/../../Library
8+
${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include
9+
)
310

411
add_executable(EnvironmentTest source/EnvironmentTest.cpp)
512
add_executable(WindowTest source/WindowTest.cpp)

Project/UnitTest/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
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)
2-
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include)
6+
include_directories(
7+
${CMAKE_CURRENT_SOURCE_DIR}/../../Library
8+
${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include
9+
)
10+
11+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest ${CMAKE_BINARY_DIR}/googletest)
12+
13+
add_definitions(-DPROJECT_ROOT_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/../..\")
314
415
set(TEST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source")
516

Project/UnitTest/source/FileUnitTest.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,19 @@
99
1010
##########################################################################################*/
1111

12+
#include <iostream>
13+
#include <string>
14+
1215
#include <gtest/gtest.h>
1316

1417
#include <PAX_SAPIENTICA/File.hpp>
1518

19+
#ifdef PROJECT_ROOT_PATH
1620
const std::string root = PROJECT_ROOT_PATH;
1721
const std::string prefix = root + "/Project/UnitTest/data/File";
22+
#else
23+
const std::string prefix = "../data/File";
24+
#endif // PROJECT_ROOT_PATH
1825

1926
TEST (FileUnitTest, readFile) {
2027
const std::string file_path = prefix + "/test_file.txt";

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)