Post-merge reapply

Meinersbur · Meinersbur · commit 4a8fef333fa3 · 2025-12-01T20:12:23.000+01:00
diff --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
@@ -24,6 +24,7 @@ set(intrinsics_sources
 set(module_sources
   __fortran_ieee_exceptions.f90
   __fortran_type_info.f90
+  f90deviceio.f90
   iso_fortran_env.f90
   ieee_arithmetic.f90
   ieee_exceptions.f90
diff --git a/openmp/module/CMakeLists.txt b/openmp/module/CMakeLists.txt
@@ -39,5 +39,5 @@ if (LIBOMP_MODULES_INSTALL_PATH)
 endif ()
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src/omp_lib.h"
-  DESTINATION ${destination}
+  DESTINATION ${DEVEL_PACKAGE}${destination}
 )

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ if (LIBOMP_MODULES_INSTALL_PATH)`
`39`	`39`	`endif ()`
`40`	`40`	`install(FILES`
`41`	`41`	`"${CMAKE_CURRENT_BINARY_DIR}/../runtime/src/omp_lib.h"`
`42`		`- DESTINATION ${destination}`
	`42`	`+ DESTINATION ${DEVEL_PACKAGE}${destination}`
`43`	`43`	`)`