Skip to content

Commit f2746ae

Browse files
committed
misc changes - rm library build, mv tests up
1 parent d3d813b commit f2746ae

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ option(
3333

3434
include(GNUInstallDirs)
3535

36-
add_subdirectory(src/beman/scope)
36+
# todo rm add_subdirectory(src/beman/scope)
3737

3838
if(BEMAN_SCOPE_BUILD_TESTS)
39-
add_subdirectory(tests/beman/scope)
39+
add_subdirectory(tests)
4040
endif()
4141

4242
if(BEMAN_SCOPE_BUILD_EXAMPLES)

examples/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ set(ALL_EXAMPLES scope_example)
55
message("Examples to be built: ${ALL_EXAMPLES}")
66

77
foreach(example ${ALL_EXAMPLES})
8-
add_executable(beman.scope.examples.${example})
9-
target_sources(beman.scope.examples.${example} PRIVATE ${example}.cpp)
10-
target_link_libraries(beman.scope.examples.${example} beman::scope)
8+
add_executable(${example})
9+
target_sources(${example} PRIVATE ${example}.cpp)
1110
endforeach()

examples/scope_example.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace scope = beman::scope;
1010

1111
void print_exit_status(std::string_view name, bool exit_status, bool did_throw) {
1212
std::cout << name << ":\n";
13-
std::cout << " Throwed exception " << (did_throw ? "yes" : "no") << "\n";
13+
std::cout << " Threw exception " << (did_throw ? "yes" : "no") << "\n";
1414
std::cout << " Exit status " << (exit_status ? "finished" : "pending") << "\n\n";
1515
}
1616

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ FetchContent_Declare(
99
)
1010
FetchContent_MakeAvailable(Catch2)
1111

12-
add_executable(beman.scope.tests.scope)
13-
target_sources(beman.scope.tests.scope PRIVATE scope.test.cpp)
12+
add_executable(tests.scope)
13+
target_sources(tests.scope PRIVATE scope.test.cpp)
1414

15-
target_link_libraries(beman.scope.tests.scope PRIVATE Catch2::Catch2WithMain)
15+
target_link_libraries(tests.scope PRIVATE Catch2::Catch2WithMain)
1616

1717
target_include_directories(
18-
beman.scope.tests.scope
18+
tests.scope
1919
PRIVATE ${CMAKE_SOURCE_DIR}/include
2020
)
2121

2222
include(CTest)
2323
include(Catch)
24-
catch_discover_tests(beman.scope.tests.scope)
24+
catch_discover_tests(tests.scope)

0 commit comments

Comments
 (0)