diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-15 07:35:02 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-15 07:35:02 +0000 |
| commit | 6e52bfe09d3ab3ae6c43c079d06ebeb7bb241dec (patch) | |
| tree | 03d6da8f8f48e0bd4f4e690d3ab1f1d8145c89b8 /openmp | |
| parent | 26bb1b1dab8bc0646073e762a9f75f2dbcd18857 (diff) | |
| download | llvm-6e52bfe09d3ab3ae6c43c079d06ebeb7bb241dec.zip llvm-6e52bfe09d3ab3ae6c43c079d06ebeb7bb241dec.tar.gz llvm-6e52bfe09d3ab3ae6c43c079d06ebeb7bb241dec.tar.bz2 | |
Revert "[cmake] Use `GNUInstallDirs` to support custom installation dirs."
Sorry for the disruption, I will try again later.
This reverts commit efeb50197091b2ade24c00b9d55814bc433a7fd1.
Diffstat (limited to 'openmp')
| -rw-r--r-- | openmp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | openmp/libompd/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | openmp/runtime/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | openmp/tools/multiplex/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index bffac03..7f11a05 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 3.13.4) -include(GNUInstallDirs) - # Add cmake directory to search for custom cmake functions. set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) diff --git a/openmp/libompd/src/CMakeLists.txt b/openmp/libompd/src/CMakeLists.txt index 25a850e..9c203bd 100644 --- a/openmp/libompd/src/CMakeLists.txt +++ b/openmp/libompd/src/CMakeLists.txt @@ -47,4 +47,4 @@ include_directories ( INSTALL( TARGETS ompd LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR} ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) + RUNTIME DESTINATION bin ) diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index 27e748c..e4f4e6e 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -346,19 +346,19 @@ add_dependencies(libomp-micro-tests libomp-test-deps) # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include if(${OPENMP_STANDALONE_BUILD}) - set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + set(LIBOMP_HEADERS_INSTALL_PATH include) else() string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") endif() if(WIN32) - install(TARGETS omp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(TARGETS omp RUNTIME DESTINATION bin) install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") # Create aliases (regular copies) of the library for backwards compatibility set(LIBOMP_ALIASES "libiomp5md") foreach(alias IN LISTS LIBOMP_ALIASES) install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\" - \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_BINDIR}\")") + \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/bin\")") install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\" \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${OPENMP_INSTALL_LIBDIR}\")") endforeach() diff --git a/openmp/tools/multiplex/CMakeLists.txt b/openmp/tools/multiplex/CMakeLists.txt index 8b50e95..64317c1 100644 --- a/openmp/tools/multiplex/CMakeLists.txt +++ b/openmp/tools/multiplex/CMakeLists.txt @@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) add_library(ompt-multiplex INTERFACE) target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - install(FILES ompt-multiplex.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + install(FILES ompt-multiplex.h DESTINATION include) add_subdirectory(tests) endif() |