Skip to content

Commit 125e5e1

Browse files
committed
Fixed CI
1 parent 4558ee5 commit 125e5e1

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

1/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
add_executable(dijkstra main.cpp)
22
add_executable(scaling_dijkstra scaling_dijkstra.cpp)
3-
4-
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC)
5-
set(OpenMP_RUNTIME_MSVC llvm)
6-
endif()
7-
8-
find_package(OpenMP REQUIRED)
3+
target_link_libraries(scaling_dijkstra PRIVATE mimalloc)
94

105
add_executable(test_dijkstra test_dijkstra.cpp)
116

1/scaling_dijkstra.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "dijkstra.hpp"
21
#include "mimalloc-new-delete.h"
2+
#include "dijkstra.hpp"
33

44
#include <chrono>
55
#include <iostream>

2/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <random>
55
#include <vector>
66

7-
#include "FF_DFS.hpp"
7+
#include "ford_fulkerson.hpp"
88

99
using namespace std;
1010

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2020

2121
FetchContent_MakeAvailable(mimalloc)
2222

23+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC)
24+
set(OpenMP_RUNTIME_MSVC llvm)
25+
endif()
26+
27+
find_package(OpenMP REQUIRED)
28+
2329
add_subdirectory(1)
2430
add_subdirectory(2)

0 commit comments

Comments
 (0)