Browse Source

build: move natvis files to source dir

skypjack 8 months ago
parent
commit
a0d738215a

+ 12 - 18
CMakeLists.txt

@@ -220,17 +220,17 @@ if(ENTT_HAS_NATVIS)
     target_sources(
         EnTT
         INTERFACE
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/config.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/container.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/core.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/entity.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/graph.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/locator.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/meta.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/poly.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/process.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/resource.natvis>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/natvis/entt/signal.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/config.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/container.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/core.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/entity.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/graph.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/locator.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/meta.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/poly.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/process.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/resource.natvis>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/natvis/signal.natvis>
     )
 endif()
 
@@ -306,13 +306,7 @@ if(ENTT_INSTALL)
         FILES_MATCHING
         PATTERN "*.h"
         PATTERN "*.hpp"
-    )
-
-    install(
-        DIRECTORY natvis/
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/entt/natvis
-        FILES_MATCHING
-        PATTERN "*.nativs"
+        PATTERN "*.natvis"
     )
 
     export(PACKAGE EnTT)

+ 1 - 1
README.md

@@ -245,7 +245,7 @@ about and can use `EnTT` from a `CMake` project without problems.
 When using `CMake`, just enable the option `ENTT_INCLUDE_NATVIS` and enjoy
 it.<br/>
 Otherwise, most of the tools are covered via Natvis and all files can be found
-in the `natvis` directory, divided by module.<br/>
+in the `natvis` subdirectory, divided by module.<br/>
 If you spot errors or have suggestions, any contribution is welcome!
 
 ## Packaging Tools

+ 1 - 1
TODO

@@ -38,4 +38,4 @@ TODO:
 * avoid copying meta_type/data/func nodes
 * paged vector as a standalone class
 * update process/scheduler natvis and doc after rework
-* move natvis files to the source dir and install with the same command as it should be
+* move tools under the entt dir

+ 0 - 0
natvis/entt/config.natvis → src/entt/natvis/config.natvis


+ 0 - 0
natvis/entt/container.natvis → src/entt/natvis/container.natvis


+ 0 - 0
natvis/entt/core.natvis → src/entt/natvis/core.natvis


+ 0 - 0
natvis/entt/entity.natvis → src/entt/natvis/entity.natvis


+ 0 - 0
natvis/entt/graph.natvis → src/entt/natvis/graph.natvis


+ 0 - 0
natvis/entt/locator.natvis → src/entt/natvis/locator.natvis


+ 0 - 0
natvis/entt/meta.natvis → src/entt/natvis/meta.natvis


+ 0 - 0
natvis/entt/poly.natvis → src/entt/natvis/poly.natvis


+ 0 - 0
natvis/entt/process.natvis → src/entt/natvis/process.natvis


+ 0 - 0
natvis/entt/resource.natvis → src/entt/natvis/resource.natvis


+ 0 - 0
natvis/entt/signal.natvis → src/entt/natvis/signal.natvis