refs #92 Переменная не нужна

izvolov · Jul 19, 2019 · a30f07b · a30f07b
1 parent dea973a
commit a30f07b
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 16 deletions.
diff --git a/online/CMakeLists.txt b/online/CMakeLists.txt
@@ -8,4 +8,4 @@ set(WANDBOX_URL "https://wandbox.org/api/compile.json")
 add_custom_target(wandbox
     COMMAND
         python burst-example.py | curl -H "Content-type: application/json" -d @- ${WANDBOX_URL}
-    DEPENDS ${UNIT_TEST_EXECUTABLE})
+    DEPENDS burst-unit-tests)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,9 +3,8 @@ find_package(Boost 1.62.0 COMPONENTS unit_test_framework REQUIRED)
 add_library(testutility INTERFACE)
 target_include_directories(testutility INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-set(UNIT_TEST_EXECUTABLE burst-unit-tests)
-add_executable(${UNIT_TEST_EXECUTABLE} test_main.cpp)
-target_link_libraries(${UNIT_TEST_EXECUTABLE}
+add_executable(burst-unit-tests test_main.cpp)
+target_link_libraries(burst-unit-tests
     PRIVATE
         testutility
         Burst::burst
@@ -16,8 +15,8 @@ find_program(GCOVR_EXECUTABLE gcovr)
 if(BURST_COVERAGE AND GCOVR_EXECUTABLE)
     message(STATUS "Test coverage is on")
 
-    target_compile_options(${UNIT_TEST_EXECUTABLE} PRIVATE --coverage)
-    target_link_libraries(${UNIT_TEST_EXECUTABLE} PRIVATE gcov)
+    target_compile_options(burst-unit-tests PRIVATE --coverage)
+    target_link_libraries(burst-unit-tests PRIVATE gcov)
 
     add_custom_target(coverage
         COMMAND
@@ -32,6 +31,6 @@ elseif(BURST_COVERAGE AND NOT GCOVR_EXECUTABLE)
     message(WARNING "Install gcovr to enable test coverage")
 endif()
 
-add_custom_target(check ALL COMMAND ${UNIT_TEST_EXECUTABLE} --report_level=short --color_output)
+add_custom_target(check ALL COMMAND burst-unit-tests --report_level=short --color_output)
 
 add_subdirectory(burst)
diff --git a/test/burst/algorithm/CMakeLists.txt b/test/burst/algorithm/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/counting_sort.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/galloping_lower_bound.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/galloping_upper_bound.cpp

diff --git a/test/burst/container/CMakeLists.txt b/test/burst/container/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_tuple.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/k_ary_search_set.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/make_sequence_container.cpp

diff --git a/test/burst/container/access/CMakeLists.txt b/test/burst/container/access/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/back.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cback.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cfront.cpp

diff --git a/test/burst/functional/CMakeLists.txt b/test/burst/functional/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/compose.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/each.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/fn.cpp

diff --git a/test/burst/integer/CMakeLists.txt b/test/burst/integer/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/divceil.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/intceil.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/intlog.cpp

diff --git a/test/burst/iterator/CMakeLists.txt b/test/burst/iterator/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/binary_stream_iterators.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/bitap_iterator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_iterator.cpp

diff --git a/test/burst/range/CMakeLists.txt b/test/burst/range/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/bitap.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cache_one.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/difference.cpp

diff --git a/test/burst/range/adaptor/CMakeLists.txt b/test/burst/range/adaptor/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/cached_one.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/intersected.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/joined.cpp

diff --git a/test/burst/tuple/CMakeLists.txt b/test/burst/tuple/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${UNIT_TEST_EXECUTABLE} PRIVATE
+target_sources(burst-unit-tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/apply.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/by.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/by_all.cpp