Skip to content

Commit

Permalink
Renamed src->quantum to eliminate pre-build header install step
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Damian <[email protected]>
  • Loading branch information
Alexander Damian committed Mar 26, 2019
1 parent 840dc7f commit 452df71
Show file tree
Hide file tree
Showing 88 changed files with 4 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions src/CMakeLists.txt → quantum/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 2 additions & 3 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand All @@ -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}
Expand Down

0 comments on commit 452df71

Please sign in to comment.