Преглед изворни кода

build system: minor changes

Michele Caini пре 6 година
родитељ
комит
b8a3bdf6b5
2 измењених фајлова са 25 додато и 37 уклоњено
  1. 12 20
      CMakeLists.txt
  2. 13 17
      docs/CMakeLists.txt

+ 12 - 20
CMakeLists.txt

@@ -81,17 +81,10 @@ add_library(EnTT::EnTT ALIAS EnTT)
 target_include_directories(
 target_include_directories(
     EnTT
     EnTT
     INTERFACE
     INTERFACE
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
+        $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 )
 
 
-target_compile_definitions(
-    EnTT
-    INTERFACE
-        $<$<AND:$<CONFIG:Debug>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:DEBUG>
-        $<$<AND:$<CONFIG:Release>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:RELEASE>
-)
-
 if(USE_ASAN)
 if(USE_ASAN)
     target_compile_options(EnTT INTERFACE $<$<CONFIG:Debug>:-fsanitize=address -fno-omit-frame-pointer>)
     target_compile_options(EnTT INTERFACE $<$<CONFIG:Debug>:-fsanitize=address -fno-omit-frame-pointer>)
     target_link_libraries(EnTT INTERFACE $<$<CONFIG:Debug>:-fsanitize=address -fno-omit-frame-pointer>)
     target_link_libraries(EnTT INTERFACE $<$<CONFIG:Debug>:-fsanitize=address -fno-omit-frame-pointer>)
@@ -193,16 +186,15 @@ endif()
 # AOB
 # AOB
 #
 #
 
 
-set(
-    AOB_SOURCES
-    .github/workflows/build.yml
-    .github/workflows/coverage.yml
-    .github/FUNDING.yml
-    AUTHORS
-    CONTRIBUTING.md
-    LICENSE
-    README.md
-    TODO
+add_custom_target(
+    aob
+    SOURCES
+        .github/workflows/build.yml
+        .github/workflows/coverage.yml
+        .github/FUNDING.yml
+        AUTHORS
+        CONTRIBUTING.md
+        LICENSE
+        README.md
+        TODO
 )
 )
-
-add_custom_target(aob SOURCES ${AOB_SOURCES})

+ 13 - 17
docs/CMakeLists.txt

@@ -9,28 +9,24 @@ set(DOXY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 
 configure_file(doxy.in doxy.cfg @ONLY)
 configure_file(doxy.in doxy.cfg @ONLY)
 
 
-set(
-    DOC_SOURCES
-    dox/extra.dox
-    md/core.md
-    md/entity.md
-    md/faq.md
-    md/lib.md
-    md/links.md
-    md/locator.md
-    md/meta.md
-    md/process.md
-    md/resource.md
-    md/signal.md
-    doxy.in
-)
-
 add_custom_target(
 add_custom_target(
     docs ALL
     docs ALL
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.cfg
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.cfg
     WORKING_DIRECTORY ${EnTT_SOURCE_DIR}
     WORKING_DIRECTORY ${EnTT_SOURCE_DIR}
     VERBATIM
     VERBATIM
-    SOURCES ${DOC_SOURCES}
+    SOURCES
+        dox/extra.dox
+        md/core.md
+        md/entity.md
+        md/faq.md
+        md/lib.md
+        md/links.md
+        md/locator.md
+        md/meta.md
+        md/process.md
+        md/resource.md
+        md/signal.md
+        doxy.in
 )
 )
 
 
 install(
 install(