Skip to content

Commit

Permalink
fixed docs
Browse files Browse the repository at this point in the history
  • Loading branch information
skypjack committed Dec 14, 2017
1 parent 1e03f27 commit 50069d3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
11 changes: 4 additions & 7 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,18 @@

set(TARGET_DOCS docs)

set(DOXY_IN_FILE doxy.in)

set(DOXY_SOURCE_DIRECTORY ${PROJECT_SRC_DIR})
set(DOXY_SOURCE_DIRECTORY ${entt_SOURCE_DIR}/src)
set(DOXY_DOCS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set(DOXY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set(DOXY_CFG_FILE doxy.cfg)

configure_file(${DOXY_IN_FILE} ${DOXY_CFG_FILE} @ONLY)
configure_file(doxy.in doxy.cfg @ONLY)

add_custom_target(
${TARGET_DOCS}
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/${DOXY_CFG_FILE}
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.cfg
WORKING_DIRECTORY ${entt_SOURCE_DIR}
VERBATIM
SOURCES ${DOXY_IN_FILE}
SOURCES doxy.in
)

install(
Expand Down
3 changes: 1 addition & 2 deletions src/entt/entity/view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,7 @@ class View final {

/**
* @brief Constructs a view out of a bunch of pools of components.
* @param pool A reference to a pool of components.
* @param other Other references to pools of components.
* @param pools References to pools of components.
*/
View(pool_type<Component>&... pools) noexcept
: pools{pools...}, view{nullptr}
Expand Down

0 comments on commit 50069d3

Please sign in to comment.