Commit 020cee1d authored by Jason Rhinelander's avatar Jason Rhinelander

Merge src/eris, include/eris -> eris/

The src/include split is more of a nuissance than anything helpful:
this commit gets rid of it, moving everything into "eris" in the
top-level directory.
parent 90ade58b
......@@ -64,8 +64,8 @@ else()
message(STATUS "API documentation generation disabled (-DAPI_DOCS=on to enable)")
endif()
file(GLOB_RECURSE eris_src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*.cpp)
file(GLOB_RECURSE eris_src_include RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/*.h include/*.hpp include/*.h.in include/*.hpp.in)
file(GLOB_RECURSE eris_src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} eris/*.cpp)
file(GLOB_RECURSE eris_src_include RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} eris/*.h eris/*.hpp eris/*.h.in eris/*.hpp.in)
foreach(h ${eris_src_include})
if(h MATCHES "\\.in$")
......@@ -76,8 +76,8 @@ foreach(h ${eris_src_include})
list(APPEND eris_doc_include "${CMAKE_CURRENT_SOURCE_DIR}/${h}")
endif()
endforeach()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_CXX_FLAGS "-std=c++11 -O2 -Wall -Wextra ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -DERIS_DEBUG")
......@@ -103,12 +103,11 @@ if (IWYU)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/iwyu.cpp "// Do-nothing file for IWYU testing of headers without associated .cpp files\n")
foreach(h ${eris_src_include})
if ((NOT h MATCHES "\\.in$")
AND (NOT h STREQUAL "include/eris/debug.hpp") # The macro voodoo in here confuses IWYU
AND (NOT h STREQUAL "eris/debug.hpp") # The macro voodoo in here confuses IWYU
)
string(REGEX REPLACE "include/eris/(.*)\\.hpp$" "src/eris/\\1.cpp" src "${h}")
string(REGEX REPLACE "eris/(.*)\\.hpp$" "eris/\\1.cpp" src "${h}")
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
string(REGEX REPLACE "^include/" "" h_noinc "${h}")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/iwyu.cpp "#include <${h_noinc}> // IWYU pragma: keep\n")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/iwyu.cpp "#include <${h}> // IWYU pragma: keep\n")
list(APPEND IWYU_ARGS_HPP_ONLY "-Xiwyu" "--check_also=${CMAKE_CURRENT_SOURCE_DIR}/${h}")
endif()
endif()
......@@ -144,10 +143,10 @@ install(TARGETS eris
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liberis.pc
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/eris/"
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/eris/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/eris/"
FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/eris/"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/eris/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/eris/"
FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h")
......
......@@ -5,7 +5,7 @@ DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = @PROJECT_NAME@
PROJECT_NUMBER = v@ERIS_VERSION@
PROJECT_BRIEF = "@eris_description@"
INPUT = README.md CODING-GUIDELINES.md @CMAKE_BINARY_DIR@/include @CMAKE_SOURCE_DIR@/include
INPUT = README.md CODING-GUIDELINES.md @CMAKE_BINARY_DIR@/eris @CMAKE_SOURCE_DIR@/eris
INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.hpp
RECURSIVE = YES
......@@ -14,9 +14,9 @@ OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@
QUIET = YES
FULL_PATH_NAMES = YES
STRIP_FROM_PATH = @CMAKE_BINARY_DIR@/include
STRIP_FROM_PATH = @CMAKE_BINARY_DIR@
STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@
STRIP_FROM_INC_PATH = @CMAKE_BINARY_DIR@/include
STRIP_FROM_INC_PATH = @CMAKE_BINARY_DIR@
JAVADOC_AUTOBRIEF = YES
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment