Fixed inlining.

NuiCpp · Oct 21, 2023 · b19e2a7 · b19e2a7
1 parent 1d33b6a
commit b19e2a7
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 24 deletions.
diff --git a/cmake/backend/emscripten.cmake b/cmake/backend/emscripten.cmake
@@ -111,6 +111,7 @@ function(nui_add_emscripten_target)
                 ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_CMAKE_OPTIONS}
                 -DNUI_INLINE_EXTRACTOR_TARGET_FILE=$<TARGET_FILE:inline-parser>
                 -DNUI_INLINE_INJECTOR_TARGET_FILE=$<TARGET_FILE:inline-injector>
+                -DNUI_MODULE_BUILD_DIR=${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}
                 "${SOURCE_DIR}"
         # copy over package.json and fill parcel options that do not exist on it
         ${BUILD_COMMAND}

diff --git a/cmake/frontend/emscripten.cmake b/cmake/frontend/emscripten.cmake
@@ -20,7 +20,7 @@ function(nui_prepare_emscripten_target)
 
     set(INLINER_COMMAND "")
     if (NOT NO_INLINE)
-        nui_enable_inline(TARGET ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET})
+        nui_enable_inline(TARGET ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET} RELATIVE_TO ${CMAKE_CURRENT_SOURCE_DIR})
         if (NOT NO_INLINE_INJECT)
             set(INLINER_COMMAND COMMAND ${NUI_INLINE_INJECTOR_TARGET_FILE} "${CMAKE_BINARY_DIR}/static/index.html" "${CMAKE_BINARY_DIR}/nui-inline/inline_imports.js" "${CMAKE_BINARY_DIR}/nui-inline/inline_imports.css")
         endif()
@@ -34,7 +34,7 @@ function(nui_prepare_emscripten_target)
 
     add_custom_target(
         ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${NUI_SOURCE_DIRECTORY}/nui/js" "${CMAKE_BINARY_DIR}/nui-js"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${NUI_SOURCE_DIRECTORY}/nui/js" "${NUI_MODULE_BUILD_DIR}/nui-js"
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC} "${CMAKE_BINARY_DIR}/static"
         ${INLINER_COMMAND}
         COMMAND "${CMAKE_BINARY_DIR}/node_modules/.bin/parcel" build --dist-dir "${CMAKE_BINARY_DIR}/bin" ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_PARCEL_ARGS}

diff --git a/cmake/inline_extractor.cmake b/cmake/inline_extractor.cmake
@@ -3,65 +3,80 @@ function(nui_preprocess_inline_js)
     set(multi_value_args EXTRA_CXX_FLAGS)
     cmake_parse_arguments(CPP "" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
-    string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
-    string(REPLACE " " ";" c_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${build_type}}")
+    set(CURRENT_BUILD_TYPE "Release")
+    if (CMAKE_BUILD_TYPE)
+        set(CURRENT_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+    endif()
+
+    string(TOUPPER ${CURRENT_BUILD_TYPE} PREPROCESS_BUILD_TYPE)
+    string(REPLACE " " ";" PREPROCESS_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${PREPROCESS_BUILD_TYPE}}")
 
+    set(INCLUDE_DIRS "$<TARGET_PROPERTY:${CPP_TARGET},INCLUDE_DIRECTORIES>")
+    set(COMPILE_DEFINITIONS "$<TARGET_PROPERTY:${CPP_TARGET},COMPILE_DEFINITIONS>")
     add_custom_command(
         OUTPUT ${CPP_OUTPUT}
         COMMAND ${CMAKE_COMMAND} -E make_directory ${CPP_DIRECTORY}
         COMMAND ${CMAKE_CXX_COMPILER}
-            #"-D$<JOIN:$<TARGET_PROPERTY:${CPP_TARGET},COMPILE_DEFINITIONS>,;-D>"
-            "-I$<JOIN:$<TARGET_PROPERTY:${CPP_TARGET},INCLUDE_DIRECTORIES>,;-I>"
-            ${c_flags}
+            "$<$<BOOL:${COMPILE_DEFINITIONS}>:-D$<JOIN:${COMPILE_DEFINITIONS},;-D>>"
+            "$<$<BOOL:${INCLUDE_DIRS}>:-I$<JOIN:${INCLUDE_DIRS},;-I>>"
+            ${PREPROCESS_CXX_FLAGS}
             $<TARGET_PROPERTY:${CPP_TARGET},COMPILE_OPTIONS>
             ${CPP_EXTRA_CXX_FLAGS}
             -E ${CPP_SOURCE} -o ${CPP_OUTPUT}
-        # COMMAND "${NUI_INLINE_EXTRACTOR_TARGET_FILE}" ${CPP_INLINE_CACHE} ${CPP_OUTPUT} ${CPP_IS_FIRST}
         COMMAND_EXPAND_LISTS VERBATIM
         IMPLICIT_DEPENDS C ${CPP_SOURCE}
         DEPENDS ${CPP_SOURCE} ${CPP_DEPENDS})
 endfunction()
 
 function(nui_enable_inline)
-    set(one_value_args TARGET UNPACKED_MODE)
+    set(one_value_args TARGET UNPACKED_MODE RELATIVE_TO)
     set(multi_value_args)
     cmake_parse_arguments(nui_enable_inline_ARGS "" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
-    get_target_property(INLINE_JS_SOURCES ${nui_enable_inline_ARGS_TARGET} SOURCES)
+    get_target_property(INLINE_SOURCES ${nui_enable_inline_ARGS_TARGET} SOURCES)
+    message(STATUS "Inline sources for ${nui_enable_inline_ARGS_TARGET}")
 
     set(INLINE_DIRECTORY_SUBDIR "nui-inline")
-    set(INLINE_DIRECTORY "${CMAKE_BINARY_DIR}/${INLINE_DIRECTORY_SUBDIR}")
+    set(INLINE_DIRECTORY "${NUI_MODULE_BUILD_DIR}/${INLINE_DIRECTORY_SUBDIR}")
     set(INLINE_CACHE "${INLINE_DIRECTORY}/inline.cache")
     set(INLINE_IMPORTS_SCRIPTS "${INLINE_DIRECTORY}/inline_imports.js")
     set(INLINE_IMPORTS_STYLES "${INLINE_DIRECTORY}/inline_imports.css")
 
     # for each source file preprocess it:
     set(IS_FIRST TRUE)
-    foreach(source_file ${INLINE_JS_SOURCES})
-        get_filename_component(source_file_name "${source_file}" NAME)
-        set(preprocessed_source_file "${INLINE_DIRECTORY}/${source_file_name}.i")
+    foreach(SOURCE_FILE ${INLINE_SOURCES})
+        # Get relative path to source file
+        file(RELATIVE_PATH SOURCE_FILE_NAME_RELATIVE "${nui_enable_inline_ARGS_RELATIVE_TO}" "${SOURCE_FILE}")
+        get_filename_component(SOURCE_FILE_NAME "${SOURCE_FILE_NAME_RELATIVE}" NAME_WE)
+        # Get just the directory part of the source file
+        get_filename_component(SOURCE_FILE_DIR "${SOURCE_FILE_NAME_RELATIVE}" DIRECTORY)
+        if (NOT "${SOURCE_FILE_DIR}" STREQUAL "")
+            set(PREPROCESSED_SOURCE_FILE "${INLINE_DIRECTORY}/${SOURCE_FILE_DIR}/${SOURCE_FILE_NAME}.i")
+        else()
+            set(PREPROCESSED_SOURCE_FILE "${INLINE_DIRECTORY}/${SOURCE_FILE_NAME}.i")
+        endif()
         nui_preprocess_inline_js(
             TARGET ${nui_enable_inline_ARGS_TARGET}
-            DIRECTORY "${INLINE_DIRECTORY}"
+            DIRECTORY "${INLINE_DIRECTORY}/${SOURCE_FILE_DIR}"
             INLINE_CACHE "${INLINE_CACHE}"
-            SOURCE "${source_file}"
-            OUTPUT "${preprocessed_source_file}"
+            SOURCE "${SOURCE_FILE}"
+            OUTPUT "${PREPROCESSED_SOURCE_FILE}"
             EXTRA_CXX_FLAGS -P -CC -DNUI_INLINE -DNUI_MODULE_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -DNUI_MODULE_CURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
             IS_FIRST ${IS_FIRST}
         )
         set(IS_FIRST FALSE)
-        message(STATUS "Preprocessing ${source_file} to ${preprocessed_source_file}")
-        list(APPEND preprocessed_sources "${preprocessed_source_file}")
+        message(STATUS "Preprocessing ${SOURCE_FILE} to ${PREPROCESSED_SOURCE_FILE}")
+        list(APPEND PREPROCESSED_SOURCES "${PREPROCESSED_SOURCE_FILE}")
     endforeach()
 
     add_custom_command(
         OUTPUT
             ${INLINE_IMPORTS_SCRIPTS}
             ${INLINE_IMPORTS_STYLES}
         COMMAND ${CMAKE_COMMAND} -E make_directory ${INLINE_DIRECTORY}
-        COMMAND "${NUI_INLINE_EXTRACTOR_TARGET_FILE}" ${INLINE_CACHE} ${CMAKE_BINARY_DIR} ${INLINE_DIRECTORY_SUBDIR} ${preprocessed_sources}
+        COMMAND "${NUI_INLINE_EXTRACTOR_TARGET_FILE}" ${INLINE_CACHE} ${CMAKE_BINARY_DIR} ${INLINE_DIRECTORY_SUBDIR} ${PREPROCESSED_SOURCES}
         COMMAND_EXPAND_LISTS VERBATIM
-        DEPENDS ${preprocessed_sources}
+        DEPENDS ${PREPROCESSED_SOURCES}
     )
 
     add_custom_target(

diff --git a/examples/basic/backend/source/backend/CMakeLists.txt b/examples/basic/backend/source/backend/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(basic-example PRIVATE main.cpp)	
+target_sources(basic-example PRIVATE main.cpp)
 
 target_include_directories(basic-example PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include)
 
@@ -11,10 +11,10 @@ set_target_properties(basic-example
 )
 
 # Creates a target that is compiled through emscripten. This target becomes the frontend part.
-nui_add_emscripten_target(basic-example
+nui_add_emscripten_target(
     TARGET
         basic-example
-    PREJS 
+    PREJS
         ${PREJS_FILE}
     SOURCE_DIR
         ${CMAKE_SOURCE_DIR}