build fix

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -362,7 +362,7 @@ endif()
 # TODO: Does this a build-dependency on the module files?
 cmake_path(GET FLANG_RT_INSTALL_RESOURCE_MOD_PATH PARENT_PATH install_mod_parent_path)
 message("FLANG_RT_INSTALL_RESOURCE_MOD_PATH: ${FLANG_RT_INSTALL_RESOURCE_MOD_PATH}")
-install(DIRECTORY "${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}"
+install(DIRECTORY "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}"
   DESTINATION "${install_mod_parent_path}"
 )
 #install(FILES "${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}/*.mod"

flang-rt/lib/runtime/CMakeLists.txt

@@ -306,7 +306,7 @@ set(Fortran_BUILDING_INSTRINSIC_MODULES TRUE)
 
 
 #add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:-module-dir> $<$<COMPILE_LANGUAGE:Fortran>:"${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}">)
-add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:SHELL:"-fintrinsic-modules-path"> $<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>)
+add_compile_options("$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>")
 
 # Phony target for intrinsics
 #add_custom_target(flangrt-mod)
@@ -372,7 +372,7 @@ else()
         ADDITIONAL_HEADERS ${public_headers} ${private_headers}
         COMPILE_OPTIONS
           "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>"
-          "$<$<COMPILE_LANGUAGE:Fortran>:${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}>"
+          "$<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>"
         TARGET_PROPERTIES
           Fortran_BUILDING_INTRINSIC_MODULES TRUE
           Fortran_BUILDING_INSTRINSIC_MODULES TRUE
@@ -382,7 +382,7 @@ else()
 #TODO: Better as -fintrinsic-modules-path, need added option
     target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${CMAKE_CURRENT_BINARY_DIR}/module.${suffix}>")
     target_compile_options(${name}.intrinsics PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${CMAKE_CURRENT_BINARY_DIR}/module.${suffix}>")
-    target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path>" "$<$<COMPILE_LANGUAGE:Fortran>:${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}>")
+    target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:SHELL:-fintrinsic-modules-path> $<$<COMPILE_LANGUAGE:Fortran>:${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}>)
 
     if (msvc_lib)
       set_target_properties(${name}

flang/cmake/modules/FlangCommon.cmake

@@ -24,7 +24,7 @@ set(FLANG_RUNTIME_F128_MATH_LIB "" CACHE STRING
   is mapped to long double, etc."
   )
 if (FLANG_RUNTIME_F128_MATH_LIB)
-  add_compile_definitions(FLANG_RUNTIME_F128_MATH_LIB="${FLANG_RUNTIME_F128_MATH_LIB}")
+  add_compile_definitions("FLANG_RUNTIME_F128_MATH_LIB=${FLANG_RUNTIME_F128_MATH_LIB}")
 endif()
 
 # Check if 128-bit float computations can be done via long double