Fix LIBOMP_COPY_EXPORTS

Author: Meinersbur

openmp/runtime/cmake/LibompExports.cmake

@@ -65,11 +65,15 @@ if(${LIBOMP_OMPT_SUPPORT})
   )
 endif()
 if(${LIBOMP_FORTRAN_MODULES})
-  add_custom_command(TARGET libomp-mod POST_BUILD
+  # libomp-mod is an OBJECT library which does not have a POST_BUILD command.
+  # attach it to omp instead an ensure libomp-mod is built before.
+  add_custom_command(TARGET omp POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBOMP_EXPORTS_MOD_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy omp_lib.mod ${LIBOMP_EXPORTS_MOD_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy omp_lib_kinds.mod ${LIBOMP_EXPORTS_MOD_DIR}
   )
+  add_dependencies(omp libomp-mod)
+
   add_custom_command(TARGET omp POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy omp_lib.h ${LIBOMP_EXPORTS_CMN_DIR}
   )

openmp/runtime/src/CMakeLists.txt

@@ -388,11 +388,6 @@ endif()
 configure_file(${LIBOMP_INC_DIR}/omp_lib.h.var omp_lib.h @ONLY)
 configure_file(${LIBOMP_INC_DIR}/omp_lib.F90.var omp_lib.F90 @ONLY)
 
-# Move files to exports/ directory if requested
-if(${LIBOMP_COPY_EXPORTS})
-  include(LibompExports)
-endif()
-
 # Micro test rules for after library has been built (cmake/LibompMicroTests.cmake)
 include(LibompMicroTests)
 add_custom_target(libomp-micro-tests)
@@ -516,3 +511,8 @@ if(LIBOMP_FORTRAN_MODULES)
     DESTINATION ${DEVEL_PACKAGE}${destination}
   )
 endif()
+
+# Move files to exports/ directory if requested
+if(${LIBOMP_COPY_EXPORTS})
+  include(LibompExports)
+endif()