Merge pull request #69 from accelerated/master

Renamed src->quantum to eliminate pre-build header install step
bloomberg · Mar 26, 2019 · c09f840 · c09f840
2 parents 840dc7f + 452df71
commit c09f840
Show file tree

Hide file tree

Showing 88 changed files with 4 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,7 +53,7 @@ if (QUANTUM_BUILD_DOC)
         # Configure Doxygen parameters
         set(DOXYGEN_PROJECT_NAME "Quantum Library")
         set(DOXYGEN_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR})
-        set(DOXYGEN_INPUT ${PROJECT_SOURCE_DIR}/src)
+        set(DOXYGEN_INPUT ${PROJECT_SOURCE_DIR}/${PROJECT_NAME})
         set(DOXYGEN_HTML_OUTPUT ${PROJECT_SOURCE_DIR}/docs)
         set(DOXYGEN_CREATE_SUBDIRS YES)
         if (DOXYGEN_DOT_FOUND AND QUANTUM_ENABLE_DOT)
@@ -96,7 +96,7 @@ else()
     message(FATAL_ERROR "Boost not found, please define BOOST_ROOT.")
 endif()
 
-add_subdirectory(src)
+add_subdirectory(${PROJECT_NAME})
 
 if (QUANTUM_ENABLE_TESTS)
     find_package(GTest REQUIRED)

diff --git a/src/CMakeLists.txt → quantum/CMakeLists.txt b/src/CMakeLists.txt → quantum/CMakeLists.txt
@@ -51,7 +51,3 @@ install(
     DESTINATION include/quantum/util/impl
     COMPONENT headers
 )
-add_custom_target(headers-install
-    COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=headers -P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
-    EXCLUDE_FROM_ALL
-)
diff --git a/src/impl/quantum_buffer_impl.h → quantum/impl/quantum_buffer_impl.h b/src/impl/quantum_buffer_impl.h → quantum/impl/quantum_buffer_impl.h
diff --git a/src/impl/quantum_capture_impl.h → quantum/impl/quantum_capture_impl.h b/src/impl/quantum_capture_impl.h → quantum/impl/quantum_capture_impl.h
diff --git a/src/impl/quantum_condition_variable_impl.h → ...um/impl/quantum_condition_variable_impl.h b/src/impl/quantum_condition_variable_impl.h → ...um/impl/quantum_condition_variable_impl.h
diff --git a/src/impl/quantum_configuration_impl.h → quantum/impl/quantum_configuration_impl.h b/src/impl/quantum_configuration_impl.h → quantum/impl/quantum_configuration_impl.h
diff --git a/src/impl/quantum_context_impl.h → quantum/impl/quantum_context_impl.h b/src/impl/quantum_context_impl.h → quantum/impl/quantum_context_impl.h
diff --git a/...pl/quantum_contiguous_pool_manager_impl.h → ...pl/quantum_contiguous_pool_manager_impl.h b/...pl/quantum_contiguous_pool_manager_impl.h → ...pl/quantum_contiguous_pool_manager_impl.h
diff --git a/...l/quantum_coroutine_pool_allocator_impl.h → ...l/quantum_coroutine_pool_allocator_impl.h b/...l/quantum_coroutine_pool_allocator_impl.h → ...l/quantum_coroutine_pool_allocator_impl.h
diff --git a/src/impl/quantum_dispatcher_core_impl.h → quantum/impl/quantum_dispatcher_core_impl.h b/src/impl/quantum_dispatcher_core_impl.h → quantum/impl/quantum_dispatcher_core_impl.h
diff --git a/src/impl/quantum_dispatcher_impl.h → quantum/impl/quantum_dispatcher_impl.h b/src/impl/quantum_dispatcher_impl.h → quantum/impl/quantum_dispatcher_impl.h
diff --git a/src/impl/quantum_future_impl.h → quantum/impl/quantum_future_impl.h b/src/impl/quantum_future_impl.h → quantum/impl/quantum_future_impl.h
diff --git a/src/impl/quantum_io_queue_impl.h → quantum/impl/quantum_io_queue_impl.h b/src/impl/quantum_io_queue_impl.h → quantum/impl/quantum_io_queue_impl.h
diff --git a/src/impl/quantum_io_task_impl.h → quantum/impl/quantum_io_task_impl.h b/src/impl/quantum_io_task_impl.h → quantum/impl/quantum_io_task_impl.h
diff --git a/src/impl/quantum_iterminate_impl.h → quantum/impl/quantum_iterminate_impl.h b/src/impl/quantum_iterminate_impl.h → quantum/impl/quantum_iterminate_impl.h
diff --git a/src/impl/quantum_mutex_impl.h → quantum/impl/quantum_mutex_impl.h b/src/impl/quantum_mutex_impl.h → quantum/impl/quantum_mutex_impl.h
diff --git a/src/impl/quantum_promise_impl.h → quantum/impl/quantum_promise_impl.h b/src/impl/quantum_promise_impl.h → quantum/impl/quantum_promise_impl.h
diff --git a/src/impl/quantum_queue_statistics_impl.h → quantum/impl/quantum_queue_statistics_impl.h b/src/impl/quantum_queue_statistics_impl.h → quantum/impl/quantum_queue_statistics_impl.h
diff --git a/src/impl/quantum_shared_state_impl.h → quantum/impl/quantum_shared_state_impl.h b/src/impl/quantum_shared_state_impl.h → quantum/impl/quantum_shared_state_impl.h
diff --git a/src/impl/quantum_spinlock_impl.h → quantum/impl/quantum_spinlock_impl.h b/src/impl/quantum_spinlock_impl.h → quantum/impl/quantum_spinlock_impl.h
diff --git a/src/impl/quantum_stack_traits_impl.h → quantum/impl/quantum_stack_traits_impl.h b/src/impl/quantum_stack_traits_impl.h → quantum/impl/quantum_stack_traits_impl.h
diff --git a/src/impl/quantum_stl_impl.h → quantum/impl/quantum_stl_impl.h b/src/impl/quantum_stl_impl.h → quantum/impl/quantum_stl_impl.h
diff --git a/src/impl/quantum_task_impl.h → quantum/impl/quantum_task_impl.h b/src/impl/quantum_task_impl.h → quantum/impl/quantum_task_impl.h
diff --git a/src/impl/quantum_task_queue_impl.h → quantum/impl/quantum_task_queue_impl.h b/src/impl/quantum_task_queue_impl.h → quantum/impl/quantum_task_queue_impl.h
diff --git a/src/interface/quantum_icontext.h → quantum/interface/quantum_icontext.h b/src/interface/quantum_icontext.h → quantum/interface/quantum_icontext.h
diff --git a/src/interface/quantum_icontext_base.h → quantum/interface/quantum_icontext_base.h b/src/interface/quantum_icontext_base.h → quantum/interface/quantum_icontext_base.h
diff --git a/src/interface/quantum_icoro_context.h → quantum/interface/quantum_icoro_context.h b/src/interface/quantum_icoro_context.h → quantum/interface/quantum_icoro_context.h
diff --git a/src/interface/quantum_icoro_context_base.h → ...um/interface/quantum_icoro_context_base.h b/src/interface/quantum_icoro_context_base.h → ...um/interface/quantum_icoro_context_base.h
diff --git a/src/interface/quantum_icoro_future.h → quantum/interface/quantum_icoro_future.h b/src/interface/quantum_icoro_future.h → quantum/interface/quantum_icoro_future.h
diff --git a/src/interface/quantum_icoro_future_base.h → ...tum/interface/quantum_icoro_future_base.h b/src/interface/quantum_icoro_future_base.h → ...tum/interface/quantum_icoro_future_base.h
diff --git a/src/interface/quantum_icoro_promise.h → quantum/interface/quantum_icoro_promise.h b/src/interface/quantum_icoro_promise.h → quantum/interface/quantum_icoro_promise.h
diff --git a/src/interface/quantum_icoro_sync.h → quantum/interface/quantum_icoro_sync.h b/src/interface/quantum_icoro_sync.h → quantum/interface/quantum_icoro_sync.h
diff --git a/src/interface/quantum_ifuture.h → quantum/interface/quantum_ifuture.h b/src/interface/quantum_ifuture.h → quantum/interface/quantum_ifuture.h
diff --git a/src/interface/quantum_ipromise.h → quantum/interface/quantum_ipromise.h b/src/interface/quantum_ipromise.h → quantum/interface/quantum_ipromise.h
diff --git a/src/interface/quantum_ipromise_base.h → quantum/interface/quantum_ipromise_base.h b/src/interface/quantum_ipromise_base.h → quantum/interface/quantum_ipromise_base.h
diff --git a/src/interface/quantum_iqueue.h → quantum/interface/quantum_iqueue.h b/src/interface/quantum_iqueue.h → quantum/interface/quantum_iqueue.h
diff --git a/src/interface/quantum_iqueue_statistics.h → ...tum/interface/quantum_iqueue_statistics.h b/src/interface/quantum_iqueue_statistics.h → ...tum/interface/quantum_iqueue_statistics.h
diff --git a/src/interface/quantum_itask.h → quantum/interface/quantum_itask.h b/src/interface/quantum_itask.h → quantum/interface/quantum_itask.h
diff --git a/src/interface/quantum_itask_accessor.h → quantum/interface/quantum_itask_accessor.h b/src/interface/quantum_itask_accessor.h → quantum/interface/quantum_itask_accessor.h
diff --git a/src/interface/quantum_itask_continuation.h → ...um/interface/quantum_itask_continuation.h b/src/interface/quantum_itask_continuation.h → ...um/interface/quantum_itask_continuation.h
diff --git a/src/interface/quantum_iterminate.h → quantum/interface/quantum_iterminate.h b/src/interface/quantum_iterminate.h → quantum/interface/quantum_iterminate.h
diff --git a/src/interface/quantum_ithread_context.h → quantum/interface/quantum_ithread_context.h b/src/interface/quantum_ithread_context.h → quantum/interface/quantum_ithread_context.h
diff --git a/src/interface/quantum_ithread_context_base.h → .../interface/quantum_ithread_context_base.h b/src/interface/quantum_ithread_context_base.h → .../interface/quantum_ithread_context_base.h
diff --git a/src/interface/quantum_ithread_future.h → quantum/interface/quantum_ithread_future.h b/src/interface/quantum_ithread_future.h → quantum/interface/quantum_ithread_future.h
diff --git a/src/interface/quantum_ithread_future_base.h → ...m/interface/quantum_ithread_future_base.h b/src/interface/quantum_ithread_future_base.h → ...m/interface/quantum_ithread_future_base.h
diff --git a/src/interface/quantum_ithread_promise.h → quantum/interface/quantum_ithread_promise.h b/src/interface/quantum_ithread_promise.h → quantum/interface/quantum_ithread_promise.h
diff --git a/src/quantum.h → quantum/quantum.h b/src/quantum.h → quantum/quantum.h
diff --git a/src/quantum_allocator.h → quantum/quantum_allocator.h b/src/quantum_allocator.h → quantum/quantum_allocator.h
diff --git a/src/quantum_allocator_traits.h → quantum/quantum_allocator_traits.h b/src/quantum_allocator_traits.h → quantum/quantum_allocator_traits.h
diff --git a/src/quantum_buffer.h → quantum/quantum_buffer.h b/src/quantum_buffer.h → quantum/quantum_buffer.h
diff --git a/src/quantum_capture.h → quantum/quantum_capture.h b/src/quantum_capture.h → quantum/quantum_capture.h
diff --git a/src/quantum_condition_variable.h → quantum/quantum_condition_variable.h b/src/quantum_condition_variable.h → quantum/quantum_condition_variable.h
diff --git a/src/quantum_configuration.h → quantum/quantum_configuration.h b/src/quantum_configuration.h → quantum/quantum_configuration.h
diff --git a/src/quantum_context.h → quantum/quantum_context.h b/src/quantum_context.h → quantum/quantum_context.h
diff --git a/src/quantum_contiguous_pool_manager.h → quantum/quantum_contiguous_pool_manager.h b/src/quantum_contiguous_pool_manager.h → quantum/quantum_contiguous_pool_manager.h
diff --git a/src/quantum_coroutine_pool_allocator.h → quantum/quantum_coroutine_pool_allocator.h b/src/quantum_coroutine_pool_allocator.h → quantum/quantum_coroutine_pool_allocator.h
diff --git a/src/quantum_dispatcher.h → quantum/quantum_dispatcher.h b/src/quantum_dispatcher.h → quantum/quantum_dispatcher.h
diff --git a/src/quantum_dispatcher_core.h → quantum/quantum_dispatcher_core.h b/src/quantum_dispatcher_core.h → quantum/quantum_dispatcher_core.h
diff --git a/src/quantum_functions.h → quantum/quantum_functions.h b/src/quantum_functions.h → quantum/quantum_functions.h
diff --git a/src/quantum_future.h → quantum/quantum_future.h b/src/quantum_future.h → quantum/quantum_future.h
diff --git a/src/quantum_future_state.h → quantum/quantum_future_state.h b/src/quantum_future_state.h → quantum/quantum_future_state.h
diff --git a/src/quantum_heap_allocator.h → quantum/quantum_heap_allocator.h b/src/quantum_heap_allocator.h → quantum/quantum_heap_allocator.h
diff --git a/src/quantum_io_queue.h → quantum/quantum_io_queue.h b/src/quantum_io_queue.h → quantum/quantum_io_queue.h
diff --git a/src/quantum_io_task.h → quantum/quantum_io_task.h b/src/quantum_io_task.h → quantum/quantum_io_task.h
diff --git a/src/quantum_macros.h → quantum/quantum_macros.h b/src/quantum_macros.h → quantum/quantum_macros.h
diff --git a/src/quantum_mutex.h → quantum/quantum_mutex.h b/src/quantum_mutex.h → quantum/quantum_mutex.h
diff --git a/src/quantum_promise.h → quantum/quantum_promise.h b/src/quantum_promise.h → quantum/quantum_promise.h
diff --git a/src/quantum_queue_statistics.h → quantum/quantum_queue_statistics.h b/src/quantum_queue_statistics.h → quantum/quantum_queue_statistics.h
diff --git a/src/quantum_shared_state.h → quantum/quantum_shared_state.h b/src/quantum_shared_state.h → quantum/quantum_shared_state.h
diff --git a/src/quantum_spinlock.h → quantum/quantum_spinlock.h b/src/quantum_spinlock.h → quantum/quantum_spinlock.h
diff --git a/src/quantum_stack_allocator.h → quantum/quantum_stack_allocator.h b/src/quantum_stack_allocator.h → quantum/quantum_stack_allocator.h
diff --git a/src/quantum_stack_traits.h → quantum/quantum_stack_traits.h b/src/quantum_stack_traits.h → quantum/quantum_stack_traits.h
diff --git a/src/quantum_task.h → quantum/quantum_task.h b/src/quantum_task.h → quantum/quantum_task.h
diff --git a/src/quantum_task_queue.h → quantum/quantum_task_queue.h b/src/quantum_task_queue.h → quantum/quantum_task_queue.h
diff --git a/src/quantum_thread_traits.h → quantum/quantum_thread_traits.h b/src/quantum_thread_traits.h → quantum/quantum_thread_traits.h
diff --git a/src/quantum_traits.h → quantum/quantum_traits.h b/src/quantum_traits.h → quantum/quantum_traits.h
diff --git a/src/quantum_yielding_thread.h → quantum/quantum_yielding_thread.h b/src/quantum_yielding_thread.h → quantum/quantum_yielding_thread.h
diff --git a/src/util/impl/quantum_future_joiner_impl.h → ...um/util/impl/quantum_future_joiner_impl.h b/src/util/impl/quantum_future_joiner_impl.h → ...um/util/impl/quantum_future_joiner_impl.h
diff --git a/...pl/quantum_sequence_key_statistics_impl.h → ...pl/quantum_sequence_key_statistics_impl.h b/...pl/quantum_sequence_key_statistics_impl.h → ...pl/quantum_sequence_key_statistics_impl.h
diff --git a/...pl/quantum_sequencer_configuration_impl.h → ...pl/quantum_sequencer_configuration_impl.h b/...pl/quantum_sequencer_configuration_impl.h → ...pl/quantum_sequencer_configuration_impl.h
diff --git a/src/util/impl/quantum_sequencer_impl.h → quantum/util/impl/quantum_sequencer_impl.h b/src/util/impl/quantum_sequencer_impl.h → quantum/util/impl/quantum_sequencer_impl.h
diff --git a/src/util/impl/quantum_util_impl.h → quantum/util/impl/quantum_util_impl.h b/src/util/impl/quantum_util_impl.h → quantum/util/impl/quantum_util_impl.h
diff --git a/src/util/quantum_future_joiner.h → quantum/util/quantum_future_joiner.h b/src/util/quantum_future_joiner.h → quantum/util/quantum_future_joiner.h
diff --git a/src/util/quantum_sequence_key_statistics.h → ...um/util/quantum_sequence_key_statistics.h b/src/util/quantum_sequence_key_statistics.h → ...um/util/quantum_sequence_key_statistics.h
diff --git a/src/util/quantum_sequencer.h → quantum/util/quantum_sequencer.h b/src/util/quantum_sequencer.h → quantum/util/quantum_sequencer.h
diff --git a/src/util/quantum_sequencer_configuration.h → ...um/util/quantum_sequencer_configuration.h b/src/util/quantum_sequencer_configuration.h → ...um/util/quantum_sequencer_configuration.h
diff --git a/src/util/quantum_util.h → quantum/util/quantum_util.h b/src/util/quantum_util.h → quantum/util/quantum_util.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,8 +2,8 @@ include(GoogleTest)
 set(TEST_TARGET quantum_tests)
 file(GLOB SOURCE_FILES *.cpp)
 include_directories(AFTER
-    ${CMAKE_INSTALL_PREFIX}/include
-    ${PROJECT_SOURCE_DIR}/tests
+    ${PROJECT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${BOOST_ROOT}
     ${GTEST_ROOT}
 )
@@ -12,7 +12,6 @@ link_directories(
     ${GTEST_ROOT}
 )
 add_executable(${TEST_TARGET} ${SOURCE_FILES})
-add_dependencies(${TEST_TARGET} headers-install)
 gtest_discover_tests(${TEST_TARGET}
                      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(${TEST_TARGET}