@@ -115,9 +115,9 @@ find_package(fmt REQUIRED CONFIG)
115
115
116
116
file (
117
117
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
121
121
include /*.hpp
122
122
include /*.natvis
123
123
SourceFileNames.cpp)
@@ -128,7 +128,7 @@ target_include_directories(mrdox-core
128
128
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /include/>"
129
129
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >"
130
130
PRIVATE
131
- "${PROJECT_SOURCE_DIR} /lib "
131
+ "${PROJECT_SOURCE_DIR} /src "
132
132
"${PROJECT_SOURCE_DIR} /include" )
133
133
target_compile_definitions (
134
134
mrdox-core
@@ -202,7 +202,7 @@ endif ()
202
202
#
203
203
#-------------------------------------------------
204
204
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)
206
206
add_executable (mrdox ${TOOL_SOURCES} )
207
207
target_compile_definitions (mrdox PRIVATE -DMRDOX_TOOL)
208
208
@@ -212,8 +212,7 @@ target_include_directories(mrdox
212
212
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR} >"
213
213
PRIVATE
214
214
"${PROJECT_SOURCE_DIR} /include"
215
- "${PROJECT_SOURCE_DIR} /lib"
216
- "${PROJECT_SOURCE_DIR} /tool"
215
+ "${PROJECT_SOURCE_DIR} /src"
217
216
)
218
217
219
218
target_compile_definitions (mrdox PRIVATE -DMRDOX_TOOL)
@@ -242,21 +241,19 @@ if (MRDOX_BUILD_TESTS)
242
241
# Unit tests
243
242
#-------------------------------------------------
244
243
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)
247
246
add_executable (mrdox-test ${TEST_SUITE_FILES} ${UNIT_TEST_SOURCES} )
248
247
target_include_directories (mrdox-test
249
248
PRIVATE
250
249
"${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"
254
251
)
255
252
target_link_libraries (mrdox-test PUBLIC mrdox-core)
256
253
if (MRDOX_CLANG)
257
254
target_compile_options (mrdox-test PRIVATE -Wno-covered-switch-default)
258
255
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 " )
260
257
add_custom_command (
261
258
# if we run tests, we need the addons in the right place.
262
259
TARGET mrdox-test
0 commit comments