Skip to content

Commit 9d076b0

Browse files
estewart08ronlieb
estewart08
authored and
ronlieb
committed
[openmp] - Remove legacy devel/runtime packaging.
Change-Id: I593c83d1313e871b1a38b9097b7b0bacc5ced288
1 parent 1fa2b6c commit 9d076b0

File tree

11 files changed

+20
-27
lines changed

11 files changed

+20
-27
lines changed

‎openmp/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
cmake_minimum_required(VERSION 3.20.0)
22

3-
if(${ENABLE_DEVEL_PACKAGE})
4-
set(DEVEL_PACKAGE "devel/")
5-
endif()
6-
if(${ENABLE_RUN_PACKAGE})
7-
set(RUN_PACKAGE "runtime/")
8-
endif()
9-
103
if(DEFINED LIBOMP_SHARED_LINKER_FLAGS)
114
set(CMAKE_SHARED_LINKER_FLAGS "${LIBOMP_SHARED_LINKER_FLAGS}")
125
endif()

‎openmp/docs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ if (LLVM_ENABLE_DOXYGEN)
8585

8686
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
8787
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html
88-
DESTINATION ${DEVEL_PACKAGE}docs/html)
88+
DESTINATION docs/html)
8989
endif()
9090
endif()
9191
endif()

‎openmp/libompd/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ if(${LIBOMP_USE_HWLOC})
5757
endif()
5858

5959
INSTALL( TARGETS ompd
60-
LIBRARY DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
61-
ARCHIVE DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
62-
RUNTIME DESTINATION "${DEVEL_PACKAGE}${CMAKE_INSTALL_BINDIR}" )
60+
LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
61+
ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}
62+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" )

‎openmp/libomptarget/DeviceRTL/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function(compileDeviceRTLLibrary target_cpu target_name target_triple)
302302
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${bclib_name} ${LIBOMPTARGET_LIBRARY_DIR}/${bclib_name})
303303

304304
# Install bitcode library under the lib destination folder.
305-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
305+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${bclib_name} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
306306

307307
# ----------------- end steps for bc file installation for opaque-linker ----------------- #
308308

@@ -401,4 +401,4 @@ set_target_properties(omptarget.devicertl PROPERTIES
401401
)
402402
target_link_libraries(omptarget.devicertl PRIVATE omptarget.devicertl.all_objs)
403403

404-
install(TARGETS omptarget.devicertl ARCHIVE DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
404+
install(TARGETS omptarget.devicertl ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}")

‎openmp/libomptarget/hostexec/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,5 @@ foreach(archname ${HOSTRPC_ARCHS})
237237
endforeach() # end for each mcpu
238238
endforeach() # end foreach archs
239239

240-
install(FILES ${h_file} DESTINATION ${DEVEL_PACKAGE}lib/clang/${LLVM_VERSION_MAJOR}/include)
241-
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/disable_dynamic_devmem.ll" DESTINATION ${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR})
240+
install(FILES ${h_file} DESTINATION lib/clang/${LLVM_VERSION_MAJOR}/include)
241+
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/disable_dynamic_devmem.ll" DESTINATION ${OPENMP_INSTALL_LIBDIR})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ else()
129129
endif()
130130

131131
# Install plugin under the lib destination folder.
132-
install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
132+
install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
133133

134134
if(NOT DEFINED CMAKE_INSTALL_RPATH)
135135
set_target_properties(omptarget.rtl.amdgpu PROPERTIES

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ else()
7979
endif()
8080

8181
# Install plugin under the lib destination folder.
82-
install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
82+
install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
8383
if(NOT DEFINED CMAKE_INSTALL_RPATH)
8484
set_target_properties(omptarget.rtl.cuda PROPERTIES
8585
INSTALL_RPATH "$ORIGIN" BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/.."

‎openmp/libomptarget/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ set_target_properties(omptarget PROPERTIES
108108
POSITION_INDEPENDENT_CODE ON
109109
INSTALL_RPATH "$ORIGIN"
110110
BUILD_RPATH "$ORIGIN:${CMAKE_CURRENT_BINARY_DIR}/..")
111-
install(TARGETS omptarget LIBRARY COMPONENT omptarget DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
111+
install(TARGETS omptarget LIBRARY COMPONENT omptarget DESTINATION "${OPENMP_INSTALL_LIBDIR}")

‎openmp/runtime/src/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ if(WIN32)
388388
endforeach()
389389
else()
390390

391-
install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}")
391+
install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")
392392

393393
if(${LIBOMP_INSTALL_ALIASES})
394394
# Create aliases (symlinks) of the library for backwards compatibility
@@ -397,26 +397,26 @@ else()
397397
extend_path(outdir "${CMAKE_INSTALL_PREFIX}" "${OPENMP_INSTALL_LIBDIR}")
398398
install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
399399
\"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
400-
\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}\")")
400+
\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")")
401401
endforeach()
402402
endif()
403403
endif()
404404
install(
405405
FILES
406406
${CMAKE_CURRENT_BINARY_DIR}/omp.h
407407
${CMAKE_CURRENT_BINARY_DIR}/ompx.h
408-
DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH}
408+
DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}
409409
)
410410
if(${LIBOMP_OMPT_SUPPORT})
411-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH})
411+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH})
412412
# install under legacy name ompt.h
413-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h)
413+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omp-tools.h DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH} RENAME ompt.h)
414414
endif()
415415
if(${LIBOMP_FORTRAN_MODULES})
416416
install(FILES
417417
${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h
418418
${CMAKE_CURRENT_BINARY_DIR}/omp_lib.mod
419419
${CMAKE_CURRENT_BINARY_DIR}/omp_lib_kinds.mod
420-
DESTINATION ${DEVEL_PACKAGE}${LIBOMP_HEADERS_INSTALL_PATH}
420+
DESTINATION ${LIBOMP_HEADERS_INSTALL_PATH}
421421
)
422422
endif()

‎openmp/tools/Modules/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313

1414
install(FILES "FindOpenMPTarget.cmake"
15-
DESTINATION "${DEVEL_PACKAGE}${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
15+
DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")

‎openmp/tools/archer/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER_SUPPORT)
1616
add_library(archer_static STATIC ompt-tsan.cpp)
1717

1818
install(TARGETS archer archer_static
19-
LIBRARY DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR}
20-
ARCHIVE DESTINATION ${RUN_PACKAGE}${OPENMP_INSTALL_LIBDIR})
19+
LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
20+
ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR})
2121

2222
add_subdirectory(tests)
2323
endif()

0 commit comments

Comments
 (0)