Skip to content

Commit a48ffd3

Browse files
committed
reverting cmake changes
1 parent 883320f commit a48ffd3

File tree

10 files changed

+32
-58
lines changed

10 files changed

+32
-58
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ endif()
99

1010
project(${LIB_TARGET} LANGUAGES CXX VERSION 0.0.1)
1111

12-
# require C++20
13-
set(CMAKE_CXX_STANDARD 20)
12+
# require C++17
13+
set(CMAKE_CXX_STANDARD 17)
1414
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1515
set(CMAKE_CXX_EXTENSIONS OFF)
1616

examples/CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
include_directories("${PROJECT_SOURCE_DIR}/include")
1+
include_directories(
2+
"${PROJECT_SOURCE_DIR}/include"
3+
)
24

3-
add_custom_target(examples) add_subdirectory(count) add_subdirectory(ports) add_subdirectory(hello)
4-
add_subdirectory(power_train) add_subdirectory(multiport_mutation)
5+
add_custom_target(examples)
6+
add_subdirectory(count)
7+
add_subdirectory(ports)
8+
add_subdirectory(hello)
9+
add_subdirectory(power_train)
10+
add_subdirectory(multiport_mutation)

examples/count/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
add_executable(count EXCLUDE_FROM_ALL main.cc) target_link_libraries(count reactor - cpp)
2-
add_dependencies(examples count)
1+
add_executable(count EXCLUDE_FROM_ALL main.cc)
2+
target_link_libraries(count reactor-cpp)
3+
add_dependencies(examples count)

examples/hello/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
add_executable(hello EXCLUDE_FROM_ALL main.cc) target_link_libraries(hello reactor - cpp)
2-
add_dependencies(examples hello)
1+
add_executable(hello EXCLUDE_FROM_ALL main.cc)
2+
target_link_libraries(hello reactor-cpp)
3+
add_dependencies(examples hello)
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
add_executable(mutation_multiports main.cc) target_link_libraries(mutation_multiports reactor - cpp)
2-
add_dependencies(examples mutation_multiports)
1+
add_executable(mutation_multiports main.cc)
2+
target_link_libraries(mutation_multiports reactor-cpp)
3+
add_dependencies(examples mutation_multiports)

examples/ports/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
add_executable(ports EXCLUDE_FROM_ALL main.cc) target_link_libraries(ports reactor - cpp)
2-
add_dependencies(examples ports)
1+
add_executable(ports EXCLUDE_FROM_ALL main.cc)
2+
target_link_libraries(ports reactor-cpp)
3+
add_dependencies(examples ports)
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
add_executable(power_train EXCLUDE_FROM_ALL main.cc) target_link_libraries(power_train reactor - cpp)
2-
add_dependencies(examples power_train)
1+
add_executable(power_train EXCLUDE_FROM_ALL main.cc)
2+
target_link_libraries(power_train reactor-cpp)
3+
add_dependencies(examples power_train)

include/reactor-cpp/topology_lock.hh

Lines changed: 0 additions & 33 deletions
This file was deleted.

lib/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ set(SOURCE_FILES
1010
time.cc
1111
multiport.cc
1212
reactor_element.cc
13-
scopes.cc
14-
transaction.cc
15-
topology_lock.cc
16-
mutations/bank.cc
17-
mutations/multiport.cc
18-
mutations/connection.cc
19-
)
13+
scopes.cc
14+
transaction.cc
15+
mutations/bank.cc
16+
mutations/multiport.cc
17+
mutations/connection.cc
18+
)
2019

2120
if(REACTOR_CPP_TRACE)
2221
set(SOURCE_FILES ${SOURCE_FILES} trace.cc )

lib/topology_lock.cc

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)