[openmp] - Remove legacy devel/runtime packaging.

Change-Id: I593c83d1313e871b1a38b9097b7b0bacc5ced288

Author: estewart08

openmp/CMakeLists.txt

@@ -1,12 +1,5 @@
 cmake_minimum_required(VERSION 3.20.0)
 
-if(${ENABLE_DEVEL_PACKAGE})
-  set(DEVEL_PACKAGE "devel/")
-endif()
-if(${ENABLE_RUN_PACKAGE})
-  set(RUN_PACKAGE "runtime/")
-endif()
-
 if(DEFINED LIBOMP_SHARED_LINKER_FLAGS)
   set(CMAKE_SHARED_LINKER_FLAGS "${LIBOMP_SHARED_LINKER_FLAGS}")
 endif()

openmp/docs/CMakeLists.txt

@@ -85,7 +85,7 @@ if (LLVM_ENABLE_DOXYGEN)
 
   if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html
-      DESTINATION ${DEVEL_PACKAGE}docs/html)
+      DESTINATION docs/html)
   endif()
 endif()
 endif()

openmp/libompd/src/CMakeLists.txt

@@ -57,6 +57,6 @@ if(${LIBOMP_USE_HWLOC})
 endif()
 
 INSTALL( TARGETS ompd
-        LIBRARY DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
-        RUNTIME DESTINATION "${DEVEL_PACKAGE}${CMAKE_INSTALL_BINDIR}" )
+        LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" )

openmp/libomptarget/DeviceRTL/CMakeLists.txt

@@ -302,7 +302,7 @@ function(compileDeviceRTLLibrary target_cpu target_name target_triple)
   set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES  ${bclib_name} ${LIBOMPTARGET_LIBRARY_DIR}/${bclib_name})
 
   # Install bitcode library under the lib destination folder.
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
 
   #  ----------------- end steps for bc file installation for opaque-linker ----------------- #
 
@@ -401,4 +401,4 @@ set_target_properties(omptarget.devicertl PROPERTIES
 )
 target_link_libraries(omptarget.devicertl PRIVATE omptarget.devicertl.all_objs)
 
-install(TARGETS omptarget.devicertl ARCHIVE DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
+install(TARGETS omptarget.devicertl ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}")

openmp/libomptarget/hostexec/CMakeLists.txt

@@ -237,5 +237,5 @@ foreach(archname ${HOSTRPC_ARCHS})
    endforeach() # end for each mcpu
 endforeach() # end foreach archs
 
-install(FILES ${h_file} DESTINATION ${DEVEL_PACKAGE}lib/clang/${LLVM_VERSION_MAJOR}/include)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/disable_dynamic_devmem.ll" DESTINATION ${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR})
+install(FILES ${h_file} DESTINATION lib/clang/${LLVM_VERSION_MAJOR}/include)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/disable_dynamic_devmem.ll" DESTINATION ${OPENMP_INSTALL_LIBDIR})

openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt

@@ -129,7 +129,7 @@ else()
 endif()
 
 # Install plugin under the lib destination folder.
-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
+install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
 
 if(NOT DEFINED CMAKE_INSTALL_RPATH)
   set_target_properties(omptarget.rtl.amdgpu PROPERTIES

openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt

@@ -79,7 +79,7 @@ else()
 endif()
 
 # Install plugin under the lib destination folder.
-install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
+install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
 if(NOT DEFINED CMAKE_INSTALL_RPATH)
 set_target_properties(omptarget.rtl.cuda PROPERTIES
   INSTALL_RPATH "$ORIGIN" BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/.."

openmp/libomptarget/src/CMakeLists.txt

@@ -108,4 +108,4 @@ set_target_properties(omptarget PROPERTIES
                       POSITION_INDEPENDENT_CODE ON
                       INSTALL_RPATH "$ORIGIN"
                       BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/..")
-install(TARGETS omptarget LIBRARY COMPONENT omptarget DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
+install(TARGETS omptarget LIBRARY COMPONENT omptarget DESTINATION "${OPENMP_INSTALL_LIBDIR}")

openmp/runtime/src/CMakeLists.txt

@@ -388,7 +388,7 @@ if(WIN32)
   endforeach()
 else()
 
-  install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
+  install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
 
   if(${LIBOMP_INSTALL_ALIASES})
     # Create aliases (symlinks) of the library for backwards compatibility
@@ -397,26 +397,26 @@ else()
       extend_path(outdir "${CMAKE_INSTALL_PREFIX}" "${OPENMP_INSTALL_LIBDIR}")
       install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
         \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
-        \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}\")")
+        \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")")
     endforeach()
   endif()
 endif()
 install(
   FILES
   ${CMAKE_CURRENT_BINARY_DIR}/omp.h
   ${CMAKE_CURRENT_BINARY_DIR}/ompx.h
-  DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH}
+  DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}
 )
 if(${LIBOMP_OMPT_SUPPORT})
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH})
   # install under legacy name ompt.h
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h)
 endif()
 if(${LIBOMP_FORTRAN_MODULES})
   install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h
     ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.mod
     ${CMAKE_CURRENT_BINARY_DIR}/omp_lib_kinds.mod
-    DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH}
+    DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}
   )
 endif()

openmp/tools/Modules/CMakeLists.txt

@@ -12,4 +12,4 @@
 
 
 install(FILES "FindOpenMPTarget.cmake"
-              DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
+              DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")