From 32c30549fa821b0df3f5f7fdf33d7989a9f1a776 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Wed, 3 Apr 2019 09:20:48 -0700 Subject: [PATCH 3/7] use GNUInstallDirs on *nix Upstream-Status: Submitted [Patch taken from Clear Linux and has been submitted upstream] Signed-off-by: Anuj Mittal --- inference-engine/thirdparty/clDNN/CMakeLists.txt | 3 +- .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++++----- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt index c39fe5c..03e5bad 100644 --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt @@ -93,7 +93,8 @@ set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused") # Build targets settings. # Path which points to default root directory for compilation output. -set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/build/out") +set(CLDNN_BUILD__DEFAULT_OUT_ROOT "${CMAKE_BINARY_DIR}") +set(CLDNN__OUTPUT_DIR, "${CMAKE_BINARY_DIR}") # Prefix for all targets in internal pass. set(CLDNN_BUILD__PROJ_NAME_PREFIX "") diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt index 99e947e..fb25578 100644 --- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt @@ -206,17 +206,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR # ========================================== Installation ============================================== +if(UNIX) + include(GNUInstallDirs) +endif(UNIX) + + # API headers. -install(DIRECTORY "${CLDNN__API_DIR}/" +if(UNIX) + install(DIRECTORY "${CLDNN__API_DIR}/" + DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN" + FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ + ) +else() + install(DIRECTORY "${CLDNN__API_DIR}/" DESTINATION "include/clDNN" FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) +endif(UNIX) + # Binaries. -install(TARGETS "${CLDNN_BUILD__PROJ}" - ARCHIVE DESTINATION "lib" - LIBRARY DESTINATION "lib" - RUNTIME DESTINATION "bin" - INCLUDES DESTINATION "include/clDNN" - ) +if(UNIX) + install(TARGETS "${CLDNN_BUILD__PROJ}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/clDNN" + ) +else() + install(TARGETS "${CLDNN_BUILD__PROJ}" + ARCHIVE DESTINATION "lib" + LIBRARY DESTINATION "lib" + RUNTIME DESTINATION "bin" + INCLUDES DESTINATION "include/clDNN" + ) +endif(UNIX) # ====================================================================================================== -- 2.7.4