Skip to content

Commit d319a06

Browse files
guinpen98guinpen98
committed
upd: Windows support
1 parent 39e1f7f commit d319a06

File tree

10 files changed

+35
-21
lines changed

10 files changed

+35
-21
lines changed

‎Project/CMakeLists.txt‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,28 @@ if(NOT CMAKE_BUILD_TYPE)
77
set(CMAKE_BUILD_TYPE Release)
88
endif()
99

10-
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
12-
elseif (CMAKE_BUILD_TYPE STREQUAL "Release")
13-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
10+
if(MSVC)
11+
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
12+
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
13+
else()
14+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
15+
endif()
16+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
17+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Od")
18+
elseif (CMAKE_BUILD_TYPE STREQUAL "Release")
19+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2")
20+
endif()
21+
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
22+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-long-long -pedantic")
23+
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
24+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
25+
elseif (CMAKE_BUILD_TYPE STREQUAL "Release")
26+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
27+
endif()
1428
endif()
1529

30+
include_directories(${CMAKE_SOURCE_DIR}/../Library)
31+
1632
get_filename_component(PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
1733
add_definitions(-DPROJECT_ROOT_PATH=\"${PARENT_DIR}\")
1834

‎Project/IncludeTest/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
2-
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../Library)
32

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

‎Project/IntegrationTest/CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
2-
include_directories(
3-
${CMAKE_CURRENT_SOURCE_DIR}/../../Library
4-
${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include
5-
)
2+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include)
63

74
add_executable(EnvironmentTest source/EnvironmentTest.cpp)
85
add_executable(WindowTest source/WindowTest.cpp)

‎Project/UnitTest/CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
2-
include_directories(
3-
${CMAKE_CURRENT_SOURCE_DIR}/../../Library
4-
${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include
5-
)
2+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../ExternalLibrary/googletest/googletest/include)
63

74
set(TEST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source")
85

‎Project/UnitTest/source/FileUnitTest.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ TEST (FileUnitTest, readTSV) {
4646
ASSERT_EQ(expected, actual);
4747
}
4848

49+
#ifndef _WIN32
4950
TEST (FileUnitTest, getFileNames) {
5051
const std::vector<std::string> expected = {
5152
prefix + "/test_file.csv",
@@ -59,3 +60,4 @@ TEST (FileUnitTest, getFileNames) {
5960
ASSERT_EQ(expected, actual);
6061

6162
}
63+
#endif // !_WIN32

‎Project/UnitTest/source/LoggerUnitTest.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ TEST (LoggerUnitTest, log) {
3434
const std::string message = "Test log";
3535
const std::string expected = "[ERROR]: " + message + " (" + __FILE__ + ":" + "0" + ")";
3636

37-
paxs::Logger logger(file_path);
38-
logger.log(paxs::Logger::Level::ERROR, __FILE__, 0, message);
37+
{
38+
paxs::Logger logger(file_path);
39+
logger.log(paxs::Logger::Level::ERROR, __FILE__, 0, message);
40+
}
41+
3942
const std::regex e ("\\[.*?\\] ");
4043
const std::string actual = std::regex_replace(paxs::File::readFile(file_path).at(0), e, "");
4144

‎Scripts/CTest.bat‎

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

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

88
:: Build the project
9-
cmake --build "%SCRIPT_DIR%..\Project\build"
9+
cmake --build "%SCRIPT_DIR%..\build"
1010

1111
:: Change directory to build and execute ctest
1212
cd "%SCRIPT_DIR%..\build"

‎Scripts/CTest.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
# Create build directory
44
SCRIPT_DIR=$(cd $(dirname $0); pwd)
5-
cmake -S${SCRIPT_DIR}/../Project -B${SCRIPT_DIR}/../Project/build
5+
cmake -S${SCRIPT_DIR}/../Project -B${SCRIPT_DIR}/../build
66

77
# Build the project
8-
cmake --build ${SCRIPT_DIR}/../Project/build
8+
cmake --build ${SCRIPT_DIR}/../build
99

1010
# Change directory to build and execute ctest
1111
cd ${SCRIPT_DIR}/../build

‎Scripts/CmakeGenerate.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
SET SCRIPT_DIR=%~dp0
44

5-
cmake -S"%SCRIPT_DIR%..\Project" -B"%SCRIPT_DIR%..\Project\build"
5+
cmake -S"%SCRIPT_DIR%..\Project" -B"%SCRIPT_DIR%..\build"

‎Scripts/CmakeGenerate.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

33
SCRIPT_DIR=$(cd $(dirname $0); pwd)
4-
cmake -S${SCRIPT_DIR}/../Project -B${SCRIPT_DIR}/../Project/build
4+
cmake -S${SCRIPT_DIR}/../Project -B${SCRIPT_DIR}/../build

0 commit comments

Comments
 (0)
⚡