Install paths

Author: Meinersbur

clang/lib/Driver/ToolChain.cpp

@@ -983,7 +983,7 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
   return {};
 }
 
-  std::optional< std::string> ToolChain::getDefaultIntrinsicModuleDir(  ) const {
+std::optional< std::string> ToolChain::getDefaultIntrinsicModuleDir(  ) const {
   SmallString<128> P(D.ResourceDir);
   llvm::sys::path::append(P, "finclude");
   return  getTargetSubDirPath(P );

flang-rt/CMakeLists.txt

@@ -76,6 +76,9 @@ include(ExtendPath)
 # Path to LLVM development tools (FileCheck, llvm-lit, not, ...)
 set(LLVM_TOOLS_DIR "${LLVM_BINARY_DIR}/bin")
 
+
+flang_module_fortran_enable()
+
 # Determine build and install paths.
 # The build path is absolute, but the install dir is relative, CMake's install
 # command has to apply CMAKE_INSTALL_PREFIX itself.
@@ -112,7 +115,7 @@ endif ()
 set(FLANG_RT_INSTALL_RESOURCE_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH_DEFAULT}"
     CACHE PATH "Path to install runtime libraries to (default: clang resource dir)")
 extend_path(FLANG_RT_INSTALL_RESOURCE_LIB_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH}" "${toolchain_lib_subdir}")
-extend_path(FLANG_RT_INSTALL_RESOURCE_MOD_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH}" "${toolchain_mod_subdir}")
+#extend_path(FLANG_RT_INSTALL_RESOURCE_MOD_PATH "${FLANG_RT_INSTALL_RESOURCE_PATH}" "${toolchain_mod_subdir}")
 cmake_path(NORMAL_PATH FLANG_RT_OUTPUT_RESOURCE_DIR)
 cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_PATH)
 # FIXME: For the libflang_rt.so, the toolchain resource lib dir is not a good
@@ -127,11 +130,11 @@ cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_PATH)
 cmake_path(NORMAL_PATH FLANG_RT_OUTPUT_RESOURCE_LIB_DIR)
 cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_LIB_PATH)
 cmake_path(NORMAL_PATH FLANG_RT_OUTPUT_RESOURCE_MOD_DIR)
-cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_MOD_PATH)
+#cmake_path(NORMAL_PATH FLANG_RT_INSTALL_RESOURCE_MOD_PATH)
 
 message("toolchain_mod_subdir: ${toolchain_mod_subdir}")
 message("FLANG_RT_OUTPUT_RESOURCE_MOD_DIR: ${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}")
-message("FLANG_RT_INSTALL_RESOURCE_MOD_PATH: ${FLANG_RT_INSTALL_RESOURCE_MOD_PATH}")
+#message("FLANG_RT_INSTALL_RESOURCE_MOD_PATH: ${FLANG_RT_INSTALL_RESOURCE_MOD_PATH}")
 
 
 #################
@@ -294,11 +297,6 @@ set(HAVE_BACKTRACE ${Backtrace_FOUND})
 set(BACKTRACE_HEADER ${Backtrace_HEADER})
 
 
-
-
-
-
-
 #####################
 # Build Preparation #
 #####################
@@ -348,28 +346,3 @@ if (FLANG_RT_INCLUDE_TESTS)
 else ()
   add_custom_target(check-flang-rt)
 endif()
-
-
-################
-# Installation #
-################
-
-
-
-
-# Need to do it here for all mod files, will install any modules in that location (including e.g. omp_lib.mod)
-# https://stackoverflow.com/questions/52712416/cmake-fortran-module-directory-to-be-used-with-add-library
-# No way to find which mod files built by flang-rt individually
-# 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 "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}"
-  DESTINATION "${install_mod_parent_path}"
-)
-#install(FILES "${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}/*.mod"
-#  DESTINATION "${FLANG_RT_INSTALL_RESOURCE_MOD_PATH}"
-#)
-
-
-
-

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -356,13 +356,11 @@ function (add_flangrt_library name)
         PROPERTIES
           ARCHIVE_OUTPUT_DIRECTORY "${FLANG_RT_OUTPUT_RESOURCE_LIB_DIR}"
           LIBRARY_OUTPUT_DIRECTORY "${FLANG_RT_OUTPUT_RESOURCE_LIB_DIR}"
-          #Fortran_MODULE_DIRECTORY "${FLANG_RT_OUTPUT_RESOURCE_MOD_DIR}"
         )
 
       install(TARGETS ${tgtname}
           ARCHIVE DESTINATION "${FLANG_RT_INSTALL_RESOURCE_LIB_PATH}"
           LIBRARY DESTINATION "${FLANG_RT_INSTALL_RESOURCE_LIB_PATH}"
-          # Fortran ???
         )
     endif ()
 

flang-rt/cmake/modules/AddFlangRTOffload.cmake

@@ -89,14 +89,14 @@ macro(enable_omp_offload_compilation name files)
         )
 
       set(OMP_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:C,CXX>:
-          -fopenmp -fvisibility=hidden -fopenmp-cuda-mode --offload-arch=${compile_for_architectures}
-          # Force LTO for the device part.
-          -foffload-lto
+        -fopenmp
+        -fvisibility=hidden
+        -fopenmp-cuda-mode
+        --offload-arch=${compile_for_architectures}
+        # Force LTO for the device part.
+        -foffload-lto
         >)
-      #set_source_files_properties(${files} PROPERTIES COMPILE_OPTIONS
-      #  "${OMP_COMPILE_OPTIONS}"
-      #  )
-      set_property(SOURCE   ${files}  APPEND
+      set_property(SOURCE ${files} APPEND
         PROPERTY COMPILE_DEFINITIONS ${OMP_COMPILE_OPTIONS}
         )
       target_link_options(${name}.static PUBLIC ${OMP_COMPILE_OPTIONS})
@@ -110,7 +110,6 @@ macro(enable_omp_offload_compilation name files)
      if (TARGET omp)
        add_dependencies(${name} omp)
        target_link_options(${name}.static PUBLIC "-L$<TARGET_FILE_DIR:omp>")
-       #target_link_libraries(${name}.static PRIVATE omp)
      endif ()
     else()
       message(FATAL_ERROR

flang-rt/lib/runtime/CMakeLists.txt

@@ -14,7 +14,7 @@ find_package(Backtrace)
 set(HAVE_BACKTRACE ${Backtrace_FOUND})
 set(BACKTRACE_HEADER ${Backtrace_HEADER})
 
-flang_module_fortran_enable()
+
 
 include(CheckFortranSourceCompiles)
 include(CMakePushCheckState)

flang/CMakeLists.txt

@@ -264,13 +264,7 @@ else()
 endif()
 
 if (FLANG_STANDALONE_BUILD)
-  option(FLANG_ENABLE_FLANG_RT "Build flang-rt and modules" ON)
-  if (FLANG_ENABLE_FLANG_RT)
-    # TODO: Add runtimes external_project
-    list(APPEND LLVM_ENABLE_RUNTIMES flang-rt)
-  else ()
-    message(STATUS "Not building Flang-RT. For a usable Fortran toolchain, compile a standalone Flang-RT.")
-  endif ()
+  message(STATUS "Not building Flang-RT. For a usable Fortran toolchain, compile a standalone Flang-RT.")
 elseif (NOT "flang-rt" IN_LIST LLVM_ENABLE_RUNTIMES)
   message(STATUS "Not building Flang-RT. For a usable Fortran toolchain, either set FLANG_ENABLE_FLANG_RT=ON, add LLVM_ENABLE_RUNTIMES=flang-rt, or compile a standalone Flang-RT.")
 endif ()
@@ -280,7 +274,7 @@ set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
 mark_as_advanced(FLANG_TOOLS_INSTALL_DIR)
 
 set(FLANG_INTRINSIC_MODULES_DIR "" CACHE PATH "Additional search path for modules; needed for running all tests if not building flang-rt in a bootstrapping build")
-set(FLANG_INCLUDE_DIR "${FLANG_BINARY_DIR}/include")
+set(FLANG_INCLUDE_DIR ${FLANG_BINARY_DIR}/include)
 
 # TODO: Remove when libclangDriver is lifted out of Clang
 if(FLANG_STANDALONE_BUILD)
@@ -502,14 +496,6 @@ endif()
 include(AddFlang)
 include(FlangCommon)
 
-include(TestBigEndian)
-test_big_endian(IS_BIGENDIAN)
-if (IS_BIGENDIAN)
-  add_compile_definitions(FLANG_BIG_ENDIAN=1)
-else ()
-  add_compile_definitions(FLANG_LITTLE_ENDIAN=1)
-endif ()
-
 if (FLANG_INCLUDE_TESTS)
   add_compile_definitions(FLANG_INCLUDE_TESTS=1)
 endif()

openmp/CMakeLists.txt

@@ -100,6 +100,10 @@ set(OPENMP_TEST_FLAGS "" CACHE STRING
 set(OPENMP_TEST_OPENMP_FLAGS ${OPENMP_TEST_COMPILER_OPENMP_FLAGS} CACHE STRING
   "OpenMP compiler flag to use for testing OpenMP runtime libraries.")
 
+if (LLVM_RUNTIMES_BUILD)
+  flang_module_fortran_enable()
+endif ()
+
 set(ENABLE_LIBOMPTARGET ON)
 # Currently libomptarget cannot be compiled on Windows or MacOS X.
 # Since the device plugins are only supported on Linux anyway,

openmp/runtime/src/CMakeLists.txt

@@ -449,7 +449,7 @@ if (LLVM_TOOL_OPENMP_BUILD)
   return ()
 endif ()
 
-flang_module_fortran_enable()
+
 
 
 
@@ -468,7 +468,7 @@ endif ()
   add_library(libomp-mod OBJECT
     omp_lib.F90
   )
-  flang_module_target(libomp-mod)
+
   add_dependencies(libomp-mod flang-rt-mod)
 
   libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS)
@@ -482,23 +482,12 @@ endif ()
   add_dependencies(libomp-mod flang-rt-mod)
   set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Fortran Modules")
 
+  flang_module_target(libomp-mod)
 
 
 
 
-
-  set (destination ${LIBOMP_HEADERS_INSTALL_PATH})
-  if (LIBOMP_MODULES_INSTALL_PATH)
-    set (destination ${LIBOMP_MODULES_INSTALL_PATH})
-  endif()
-  install(TARGETS libomp-mod
-          ARCHIVE DESTINATION "${LIBOMP_INSTALL_RESOURCE_LIB_PATH}"
-          LIBRARY DESTINATION "${LIBOMP_INSTALL_RESOURCE_LIB_PATH}"
-          # Fortran ???
-)
   install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h
-    "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}/omp_lib.mod"
-    "${RUNTIMES_OUTPUT_RESOURCE_MOD_DIR}/omp_lib_kinds.mod"
-    DESTINATION "${RUNTIMES_INSTALL_RESOURCE_MOD_PATH}"
+    "${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h"
+    DESTINATION "${RUNTIMES_INSTALL_RESOURCE_INCLUDE_PATH}"
   )