Skip to content

Commit 04f75dd

Browse files
committed
refactor: move source files to src
1 parent e14fe08 commit 04f75dd

File tree

123 files changed

+187
-1039
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+187
-1039
lines changed

CMakeLists.txt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ find_package(fmt REQUIRED CONFIG)
115115

116116
file(
117117
GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS
118-
lib/*.cpp
119-
lib/*.hpp
120-
lib/*.natvis
118+
src/lib/*.cpp
119+
src/lib/*.hpp
120+
src/lib/*.natvis
121121
include/*.hpp
122122
include/*.natvis
123123
SourceFileNames.cpp)
@@ -128,7 +128,7 @@ target_include_directories(mrdox-core
128128
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>"
129129
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
130130
PRIVATE
131-
"${PROJECT_SOURCE_DIR}/lib"
131+
"${PROJECT_SOURCE_DIR}/src"
132132
"${PROJECT_SOURCE_DIR}/include")
133133
target_compile_definitions(
134134
mrdox-core
@@ -202,7 +202,7 @@ endif ()
202202
#
203203
#-------------------------------------------------
204204

205-
file(GLOB_RECURSE TOOL_SOURCES CONFIGURE_DEPENDS tool/*.cpp tool/*.hpp)
205+
file(GLOB_RECURSE TOOL_SOURCES CONFIGURE_DEPENDS src/tool/*.cpp src/tool/*.hpp)
206206
add_executable(mrdox ${TOOL_SOURCES})
207207
target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL)
208208

@@ -212,8 +212,7 @@ target_include_directories(mrdox
212212
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
213213
PRIVATE
214214
"${PROJECT_SOURCE_DIR}/include"
215-
"${PROJECT_SOURCE_DIR}/lib"
216-
"${PROJECT_SOURCE_DIR}/tool"
215+
"${PROJECT_SOURCE_DIR}/src"
217216
)
218217

219218
target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL)
@@ -242,21 +241,19 @@ if (MRDOX_BUILD_TESTS)
242241
# Unit tests
243242
#-------------------------------------------------
244243
include(CTest)
245-
file(GLOB_RECURSE TEST_SUITE_FILES CONFIGURE_DEPENDS test/test_suite/*.cpp test/test_suite/*.hpp)
246-
file(GLOB_RECURSE UNIT_TEST_SOURCES CONFIGURE_DEPENDS test/unit/*.cpp test/unit/*.hpp)
244+
file(GLOB_RECURSE TEST_SUITE_FILES CONFIGURE_DEPENDS src/test/test_suite/*.cpp src/test/test_suite/*.hpp)
245+
file(GLOB_RECURSE UNIT_TEST_SOURCES CONFIGURE_DEPENDS src/test/unit/*.cpp src/test/unit/*.hpp)
247246
add_executable(mrdox-test ${TEST_SUITE_FILES} ${UNIT_TEST_SOURCES})
248247
target_include_directories(mrdox-test
249248
PRIVATE
250249
"${PROJECT_SOURCE_DIR}/include"
251-
"${PROJECT_SOURCE_DIR}/lib"
252-
"${PROJECT_SOURCE_DIR}/tool"
253-
"${PROJECT_SOURCE_DIR}/test/test_suite"
250+
"${PROJECT_SOURCE_DIR}/src"
254251
)
255252
target_link_libraries(mrdox-test PUBLIC mrdox-core)
256253
if (MRDOX_CLANG)
257254
target_compile_options(mrdox-test PRIVATE -Wno-covered-switch-default)
258255
endif ()
259-
target_compile_definitions(mrdox-test PRIVATE -DMRDOX_UNIT_TEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test/unit")
256+
target_compile_definitions(mrdox-test PRIVATE -DMRDOX_TEST_FILES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test-files")
260257
add_custom_command(
261258
# if we run tests, we need the addons in the right place.
262259
TARGET mrdox-test
File renamed without changes.

lib/-XML/CXXTags.hpp renamed to src/lib/-XML/CXXTags.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// Official repository: https://github.com/cppalliance/mrdox
1111
//
1212

13-
#ifndef MRDOX_TOOL_XML_CXXTAGS_HPP
14-
#define MRDOX_TOOL_XML_CXXTAGS_HPP
13+
#ifndef MRDOX_LIB_XML_CXXTAGS_HPP
14+
#define MRDOX_LIB_XML_CXXTAGS_HPP
1515

1616
#include "XMLTags.hpp"
1717
#include <mrdox/Metadata/Function.hpp>

lib/-XML/XMLGenerator.cpp renamed to src/lib/-XML/XMLGenerator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#include "XMLGenerator.hpp"
1313
#include "XMLWriter.hpp"
14-
#include "Support/Radix.hpp"
15-
#include "Support/RawOstream.hpp"
14+
#include "lib/Support/Radix.hpp"
15+
#include "lib/Support/RawOstream.hpp"
1616
#include <mrdox/Support/Error.hpp>
1717
#include <mrdox/Metadata.hpp>
1818

lib/-XML/XMLGenerator.hpp renamed to src/lib/-XML/XMLGenerator.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// Official repository: https://github.com/cppalliance/mrdox
1010
//
1111

12-
#ifndef MRDOX_TOOL_XML_XMLGENERATOR_HPP
13-
#define MRDOX_TOOL_XML_XMLGENERATOR_HPP
12+
#ifndef MRDOX_LIB_XML_XMLGENERATOR_HPP
13+
#define MRDOX_LIB_XML_XMLGENERATOR_HPP
1414

1515
#include <mrdox/Platform.hpp>
1616
#include <mrdox/Generator.hpp>

lib/-XML/XMLTags.cpp renamed to src/lib/-XML/XMLTags.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111

1212
#include "XMLTags.hpp"
13-
#include "Support/Radix.hpp"
13+
#include "lib/Support/Radix.hpp"
1414
#include <mrdox/Platform.hpp>
1515

1616
namespace clang {

lib/-XML/XMLTags.hpp renamed to src/lib/-XML/XMLTags.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// Official repository: https://github.com/cppalliance/mrdox
1010
//
1111

12-
#ifndef MRDOX_TOOL_XML_XMLTAGS_HPP
13-
#define MRDOX_TOOL_XML_XMLTAGS_HPP
12+
#ifndef MRDOX_LIB_XML_XMLTAGS_HPP
13+
#define MRDOX_LIB_XML_XMLTAGS_HPP
1414

1515
#include <mrdox/Platform.hpp>
1616
#include <mrdox/Metadata/Javadoc.hpp>

lib/-XML/XMLWriter.cpp renamed to src/lib/-XML/XMLWriter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
#include "CXXTags.hpp"
1414
#include "XMLWriter.hpp"
15-
#include "Lib/ConfigImpl.hpp"
16-
#include "Support/Yaml.hpp"
17-
#include "Support/Radix.hpp"
18-
#include "Support/SafeNames.hpp"
15+
#include "lib/Lib/ConfigImpl.hpp"
16+
#include "lib/Support/Yaml.hpp"
17+
#include "lib/Support/Radix.hpp"
18+
#include "lib/Support/SafeNames.hpp"
1919
#include <mrdox/Platform.hpp>
2020
#include <llvm/Support/YAMLParser.h>
2121
#include <llvm/Support/YAMLTraits.h>

lib/-XML/XMLWriter.hpp renamed to src/lib/-XML/XMLWriter.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
// Official repository: https://github.com/cppalliance/mrdox
1010
//
1111

12-
#ifndef MRDOX_TOOL_XML_XMLWRITER_HPP
13-
#define MRDOX_TOOL_XML_XMLWRITER_HPP
12+
#ifndef MRDOX_LIB_XML_XMLWRITER_HPP
13+
#define MRDOX_LIB_XML_XMLWRITER_HPP
1414

1515
#include "XMLTags.hpp"
16-
#include "Support/YamlFwd.hpp"
16+
#include "lib/Support/YamlFwd.hpp"
1717
#include <mrdox/Corpus.hpp>
1818
#include <mrdox/Metadata.hpp>
1919
#include <mrdox/Support/Error.hpp>
File renamed without changes.

0 commit comments

Comments
 (0)