Clean up project structure

Author: MarcusTomlinson

CMakeLists.txt

@@ -23,6 +23,8 @@ install(FILES ${root_hdrs} DESTINATION include)
 install(FILES ${dspatch_hdrs} DESTINATION include/dspatch)
 install(FILES ${fast_any_hdrs} DESTINATION include/fast_any)
 
+include_directories(include)
+
 add_subdirectory(docs)
 add_subdirectory(tests)
 add_subdirectory(tutorial)

docs/Doxyfile

@@ -703,9 +703,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is 
 # run.
 
-EXCLUDE                = ../include/DSPatchVersion.h \
-                         ../include/fast_any \
-                         ../subprojects \
+EXCLUDE                = ../include/fast_any \
                          ../tests \
                          ../tutorial
 

meson.build

@@ -12,7 +12,6 @@ opencppcoverage = find_program('opencppcoverage', required: false)
 
 opencppcoverage_args = [
     '--sources', meson.project_name(),
-    '--excluded_sources', 'subprojects',
     '--excluded_sources', 'tests',
     '--excluded_sources', 'tutorial'
 ]
@@ -69,12 +68,7 @@ if find_program('cppcheck', required: false).found()
             '--suppress=*:' + meson.current_source_dir() + '/include/fast_any/any.h',
 
             '-i', meson.current_source_dir() + '/build',
-            '-i', meson.current_source_dir() + '/builddir',
-            '-i', meson.current_source_dir() + '/subprojects',
-
             '-I', meson.current_source_dir() + '/include',
-            '-I', meson.current_source_dir() + '/tests',
-            '-I', meson.current_source_dir() + '/tutorial',
 
             extra_cppcheck_args,
 
@@ -86,12 +80,8 @@ endif
 
 # Configure DSPatch
 
-dspatch_inc = include_directories(
-    'include'
-)
-
 dspatch_dep = declare_dependency(
-  include_directories: dspatch_inc,
+  include_directories: include_directories('include'),
   dependencies: dependency('threads')
 )
 

scripts/clang-format.bat

@@ -12,7 +12,7 @@ for %%f in ("*.cpp", "*.h") do (
 
 for /D %%d in (*) do (
 	cd %%d
-	if not %%d==build if not %%d==builddir if not %%d==subprojects call :processDir
+	if not %%d==build if not %%d==builddir call :processDir
 	cd ..
 )
 

scripts/clang-format.sh

@@ -3,4 +3,4 @@
 DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 cd "$DIR/.."
 
-find . -iname *.h -o -iname *.cpp | grep -v build | grep -v builddir | grep -v subprojects | xargs clang-format --style=file --verbose -i
+find . -iname *.h -o -iname *.cpp | grep -v build | grep -v builddir | xargs clang-format --style=file --verbose -i

subprojects/catch/meson.build

@@ -1,10 +1,6 @@
 project(DSPatchTests)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../subprojects/catch
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 file(GLOB srcs *.cpp)
 

tests/CMakeLists.txt

@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <DSPatch.h>
 
-#include <catch.hpp>
+#include <catch/catch.hpp>
 
 #include "components/Adder.h"
 #include "components/BranchSyncProbe.h"

subprojects/catch/catch.hpp renamed to tests/catch/catch.hpp

@@ -1,8 +1,3 @@
-# Configure catch
-
-catch = subproject('catch')
-catch_dep = catch.get_variable('catch_dep')
-
 # Configure tests
 
 dspatch_tests_src = [
@@ -16,7 +11,7 @@ dspatch_tests = executable(
     format_first,
     dspatch_tests_src,
     include_directories: dspatch_tests_inc,
-    dependencies: [dspatch_dep, catch_dep]
+    dependencies: dspatch_dep
 )
 
 # Add code coverage