Fix dependency tracking

- Make sure the *.cpp.o.d and link.d files are created to ensure
  that CMake recompiles a target when its dependencies change
- Also add release type specific flags to the GCC pass

Author: jolly-chen

refl/CMakeLists.txt

@@ -10,10 +10,14 @@ message(STATUS "Compiling EDG versions with ${CMAKE_CXX_COMPILER} and ${EDG_GCC_
 message(STATUS "Linking EDG versions with ${EDG_LINKER}")
 
 set(CMAKE_DEPFILE_FLAGS_CXX "")
+message(STATUS "CMAKE_DEPFILE_FLAGS_CXX: ${CMAKE_DEPFILE_FLAGS_CXX}")
 
-set(EDG_CPFE_DEFAULT_OPTIONS --g++ --set_flag=reflection --c++26 --gnu 140200 -tlocal --no_strict_gnu --no_char8_t)
+set(EDG_CPFE_DEFAULT_OPTIONS --g++ --set_flag=reflection --c++26 --gnu 140200 -tlocal --no_strict_gnu --no_char8_t
+                             --extern_inline)
 set(EDG_DEFAULT_DEFINES __CHAR_BIT__=8  _POSIX_SOURCE)
-set(EDG_C_TO_OBJ_DEFAULT_OPTIONS -Dsetjmp=_setjmp -Dva_copy=__va_copy -falign-functions=4 -march=skylake ${CMAKE_CXX_FLAGS})
+set(EDG_C_TO_OBJ_DEFAULT_OPTIONS -Dsetjmp=_setjmp -Dva_copy=__va_copy -falign-functions=4 -march=skylake
+                                 ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} ${CMAKE_CXX_FLAGS}
+                                 -finline-functions)
 separate_arguments(EDG_C_TO_OBJ_DEFAULT_OPTIONS)
 set(EDG_C_TO_OBJ_LIBRARIES -shared-libgcc -lstdc++ -lgcc_s -lpthread -lm)
 
@@ -37,7 +41,7 @@ separate_arguments(sys_incl_dirs)
 
 #### Options that are set differently for edgcpfe than for g++ ####
 unset(CMAKE_CXX_STANDARD)
-
+set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER} "")
 set(CMAKE_CXX_FLAGS "")
 
 # Replaces the default -isystem with --sys_include
@@ -56,7 +60,7 @@ unset(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES)
 
 # Do not add -Wl, rpath flags to the linker command line (edg_prelink does not support them)
 set(CMAKE_SKIP_RPATH TRUE)
-# Do not add -Wl, --dependency-file flag to the linker command line
+# Do not add -Wl, --dependency-file flag to the edg_prelink command
 set(CMAKE_LINK_DEPENDS_USE_LINKER FALSE)
 
 ###########
@@ -66,24 +70,43 @@ include(CMakePrintHelpers)
 function(add_edg_executable target sources)
     add_executable(${target} ${sources})
     target_include_directories(${target} SYSTEM AFTER PUBLIC ${sys_incl_dirs} $ENV{EDG_BASE}/include)
-    target_include_directories(${target} PUBLIC ${PROJECT_SOURCE_DIR} reflmempp/include reflmempp/include/kokkos/include/mdspan)
+    target_include_directories(${target} PUBLIC ${PROJECT_SOURCE_DIR} reflmempp/include
+                                                reflmempp/include/kokkos/include/mdspan)
 
     target_compile_options(${target} PUBLIC ${EDG_CPFE_DEFAULT_OPTIONS})
     # target_compile_options(${target} PUBLIC --error_limit=1) # for debugging
 
     # By products
     target_compile_options(${target} PUBLIC --gen_c_file_name=CMakeFiles/${target}.dir/${target}.int.c
                                             --ii_file=CMakeFiles/${target}.dir/${target}.cpp.ii
-                                            --template_info_file=CMakeFiles/${target}.dir/${target}.cpp.ti)
+                                            --template_info_file=CMakeFiles/${target}.dir/${target}.cpp.ti
+                                            -LCMakeFiles/${target}.dir/${target}.diagnostics)
 
     target_compile_definitions(${target} PUBLIC ${EDG_DEFAULT_DEFINES})
 
+    add_custom_command(
+        TARGET ${target}
+        PRE_BUILD
+        COMMAND echo "CMakeFiles/${target}.dir/${target}.cpp.o: \\\\" > CMakeFiles/${target}.dir/${target}.cpp.o.d
+        COMMAND ${CMAKE_CXX_COMPILER} $<TARGET_PROPERTY:${target},COMPILE_OPTIONS>
+                "-D$<JOIN:$<TARGET_PROPERTY:${target},COMPILE_DEFINITIONS>,;-D>"
+                "-I$<JOIN:$<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>,;-I>"
+                --dependencies ${sources} | sed "s/^${target}.o://" | sed "'s/$$/ \\\\/'"
+                >> CMakeFiles/${target}.dir/${target}.cpp.o.d
+        COMMENT "Add dependencies to CMakeFiles/${target}.dir/${target}.cpp.o.d"
+        BYPRODUCTS CMakeFiles/${target}.dir/${target}.cpp.o.d
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND_EXPAND_LISTS
+    )
+
     add_custom_command(
         TARGET ${target}
         PRE_LINK
-        COMMAND ${EDG_GCC_TO_USE} ${EDG_C_TO_OBJ_DEFAULT_OPTIONS} -g -c CMakeFiles/${target}.dir/${target}.int.c
+        COMMAND ${EDG_GCC_TO_USE} ${EDG_C_TO_OBJ_DEFAULT_OPTIONS} -c CMakeFiles/${target}.dir/${target}.int.c
         COMMAND mv -f ${target}.int.o CMakeFiles/${target}.dir/${target}.cpp.o
-        BYPRODUCTS CMakeFiles/${target}.dir/${target}.cpp.o
+        BYPRODUCTS CMakeFiles/${target}.dir/${target}.int.c CMakeFiles/${target}.dir/${target}.cpp.ii
+                   CMakeFiles/${target}.dir/${target}.cpp.ti CMakeFiles/${target}.dir/${target}.cpp.o
+                   CMakeFiles/${target}.dir/${target}.diagnostics
         COMMENT "Building CMakeFiles/${target}.dir/${target}.cpp.o"
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
@@ -108,9 +131,10 @@ function(add_edg_executable target sources)
         TARGET ${target}
         POST_BUILD
         COMMAND ${EDG_GCC_TO_USE} ${EDG_C_TO_OBJ_DEFAULT_OPTIONS} "$<$<BOOL:${link_dirs}>:-L$<JOIN:${link_dirs},;-L>>"
-                -o ${target} CMakeFiles/${target}.dir/${target}.cpp.o ${link_lib_paths} ${EDG_C_TO_OBJ_LIBRARIES}
-                -lrt -lC
+                -Wl,--dependency-file=CMakeFiles/${target}.dir/link.d -o ${target}
+                CMakeFiles/${target}.dir/${target}.cpp.o ${link_lib_paths} ${EDG_C_TO_OBJ_LIBRARIES} -lrt -lC
         COMMENT "Complete linking"
+        BYPRODUCTS ${target} CMakeFiles/${target}.dir/link.d
         COMMAND_EXPAND_LISTS
     )
 endfunction()