[#154] Use separate include directories for each component

This also fixed a bug where components were not actually usable
parallaxinc · Feb 28, 2019 · 6195669 · 6195669
1 parent 68e60ad
commit 6195669
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 21 deletions.
diff --git a/CMakeModules b/CMakeModules
diff --git a/PropWareInstall.cmake b/PropWareInstall.cmake
@@ -22,17 +22,29 @@ if (PACKAGE_OSX)
         COMPONENT macosx_cmakemodules)
 endif ()
 
-# PropWare & libpropeller includes
+# PropWare includes
 install(DIRECTORY
         "${PROJECT_SOURCE_DIR}/PropWare"
+    DESTINATION share/PropWare/include/PropWare
+    COMPONENT propware
+    FILES_MATCHING PATTERN *.h)
+
+# libpropeller includes
+install(DIRECTORY
         "${PROJECT_SOURCE_DIR}/libpropeller/libpropeller"
-        "${PROJECT_SOURCE_DIR}/libArduino/libPropelleruino/"
-    DESTINATION share/PropWare/include/c++
+    DESTINATION share/PropWare/include/Libpropeller
     COMPONENT propware
     FILES_MATCHING PATTERN *.h
     PATTERN libpropeller/libpropeller/compile_tools EXCLUDE
     PATTERN libpropeller/libpropeller/unity_tools/asmsrc EXCLUDE)
 
+# libPropelleruino includes
+install(DIRECTORY
+        "${PROJECT_SOURCE_DIR}/libArduino/libPropelleruino/"
+    DESTINATION share/PropWare/include/LibPropelleruino
+    COMPONENT propware
+    FILES_MATCHING PATTERN *.h)
+
 # Version file
 file(WRITE "${PROJECT_BINARY_DIR}/version.txt" "${PROJECT_VERSION}")
 install(FILES

diff --git a/PropWareSources.cmake b/PropWareSources.cmake
@@ -1,5 +1,5 @@
 function(create_pw_lib)
-    set(options C_ONLY)
+    set(options )
     set(oneValueArgs LIB_NAME MODEL)
     set(multiValueArgs EXTRA_INCLUDE_DIRS SOURCES)
     cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -12,17 +12,18 @@ function(create_pw_lib)
     set_compile_flags(${TARGET} ${ARGS_MODEL})
     if (NOT LIB_NAME STREQUAL "PropWare")
         target_compile_options(${TARGET} PRIVATE -w)
-    endif ()
-    if (ARGS_C_ONLY)
-        set(SYSTEM_ARG SYSTEM)
-        target_include_directories(${TARGET} SYSTEM PUBLIC $<INSTALL_INTERFACE:share/PropWare/include>)
-    else ()
-        target_include_directories(${TARGET} PUBLIC $<INSTALL_INTERFACE:share/PropWare/include/c++>)
+        if (LIB_NAME STREQUAL "Simple")
+            set(SYSTEM_ARG SYSTEM)
+        endif ()
     endif ()
     foreach(d IN LISTS ARGS_EXTRA_INCLUDE_DIRS)
         list(APPEND BUILD_INTERFACE_DIRS $<BUILD_INTERFACE:${d}>)
     endforeach()
-    target_include_directories(${TARGET} ${SYSTEM_ARG} PUBLIC ${BUILD_INTERFACE_DIRS})
+    target_include_directories(${TARGET} ${SYSTEM_ARG}
+        PUBLIC
+            ${BUILD_INTERFACE_DIRS}
+            $<INSTALL_INTERFACE:share/PropWare/include/${ARGS_LIB_NAME}>
+    )
     set_linker(${TARGET})
     set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${ARGS_LIB_NAME})
     install(TARGETS ${TARGET}

diff --git a/external_libs/CMakeLists.txt b/external_libs/CMakeLists.txt
@@ -56,13 +56,18 @@ foreach(project_file IN LISTS SIMPLE_IDE_PROJECT_FILES)
 endforeach()
 
 install(FILES ${SIMPLE_HEADERS}
-    DESTINATION share/PropWare/include
+    DESTINATION share/PropWare/include/Simple
     COMPONENT propware)
 ####################################################################
 
 ####################################################################
+add_library(ArduinoJson INTERFACE)
+target_include_directories(ArduinoJson INTERFACE
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ArduinoJson/src>
+    $<INSTALL_INTERFACE:share/PropWare/include/ArduinoJson>
+)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/ArduinoJson/src/
-    DESTINATION share/PropWare/include/c++
+    DESTINATION share/PropWare/include/ArduinoJson
     COMPONENT propware)
 ####################################################################
 

diff --git a/external_libs/cmm/CMakeLists.txt b/external_libs/cmm/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODEL cmm)
 parse_simpleide_project_files(Simple_${MODEL} "${SIMPLE_IDE_PROJECT_FILES}")
-create_pw_lib(LIB_NAME Simple MODEL ${MODEL} C_ONLY
+create_pw_lib(LIB_NAME Simple MODEL ${MODEL}
     EXTRA_INCLUDE_DIRS ${SIMPLE_INCLUDE_DIRS}
 )
 create_pw_lib(LIB_NAME Libpropeller MODEL ${MODEL}

diff --git a/external_libs/cog/CMakeLists.txt b/external_libs/cog/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODEL cog)
 parse_simpleide_project_files(Simple_${MODEL} "${SIMPLE_IDE_PROJECT_FILES}")
-create_pw_lib(LIB_NAME Simple MODEL ${MODEL} C_ONLY
+create_pw_lib(LIB_NAME Simple MODEL ${MODEL}
     EXTRA_INCLUDE_DIRS ${SIMPLE_INCLUDE_DIRS}
 )
 create_pw_lib(LIB_NAME Libpropeller MODEL ${MODEL}

diff --git a/external_libs/lmm/CMakeLists.txt b/external_libs/lmm/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODEL lmm)
 parse_simpleide_project_files(Simple_${MODEL} "${SIMPLE_IDE_PROJECT_FILES}")
-create_pw_lib(LIB_NAME Simple MODEL ${MODEL} C_ONLY
+create_pw_lib(LIB_NAME Simple MODEL ${MODEL}
     EXTRA_INCLUDE_DIRS ${SIMPLE_INCLUDE_DIRS}
 )
 create_pw_lib(LIB_NAME Libpropeller MODEL ${MODEL}

diff --git a/external_libs/xmm-single/CMakeLists.txt b/external_libs/xmm-single/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODEL xmm-single)
 parse_simpleide_project_files(Simple_${MODEL} "${SIMPLE_IDE_PROJECT_FILES}")
-create_pw_lib(LIB_NAME Simple MODEL ${MODEL} C_ONLY
+create_pw_lib(LIB_NAME Simple MODEL ${MODEL}
     EXTRA_INCLUDE_DIRS ${SIMPLE_INCLUDE_DIRS}
 )
 create_pw_lib(LIB_NAME Libpropeller MODEL ${MODEL}

diff --git a/external_libs/xmm-split/CMakeLists.txt b/external_libs/xmm-split/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODEL xmm-split)
 parse_simpleide_project_files(Simple_${MODEL} "${SIMPLE_IDE_PROJECT_FILES}")
-create_pw_lib(LIB_NAME Simple MODEL ${MODEL} C_ONLY
+create_pw_lib(LIB_NAME Simple MODEL ${MODEL}
     EXTRA_INCLUDE_DIRS ${SIMPLE_INCLUDE_DIRS}
 )
 create_pw_lib(LIB_NAME Libpropeller MODEL ${MODEL}

diff --git a/external_libs/xmmc/CMakeLists.txt b/external_libs/xmmc/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODEL xmmc)
 parse_simpleide_project_files(Simple_${MODEL} "${SIMPLE_IDE_PROJECT_FILES}")
-create_pw_lib(LIB_NAME Simple MODEL ${MODEL} C_ONLY
+create_pw_lib(LIB_NAME Simple MODEL ${MODEL}
     EXTRA_INCLUDE_DIRS ${SIMPLE_INCLUDE_DIRS}
 )
 create_pw_lib(LIB_NAME Libpropeller MODEL ${MODEL}

diff --git a/test/PropWare/CMakeLists.txt b/test/PropWare/CMakeLists.txt
@@ -30,5 +30,5 @@ set_tests_properties(
     PROPERTIES LABELS hardware-independent)
 
 install(FILES PropWareTests.h
-    DESTINATION share/PropWare/include/c++/PropWare
+    DESTINATION share/PropWare/include/PropWare/PropWare
     COMPONENT propware)