Skip to content

Commit

Permalink
build: define CMAKE_INSTALL_LIBDIR for bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
densamoilov committed Jun 20, 2019
1 parent 817bc9a commit 7c946ef
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ if(UNIX OR MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()

include(GNUInstallDirs)
include(CMakePackageConfigHelpers)

# Tentative remapping of old options to the new one.
# CAUTION: The old options will soon be removed.

Expand Down Expand Up @@ -125,6 +122,14 @@ configure_file(
)
include_directories(${PROJECT_BINARY_DIR}/include)

if(MKLDNN_INSTALL_MODE STREQUAL "BUNDLE" AND NOT DEFINED CMAKE_INSTALL_LIBDIR)
# define CMAKE_INSTALL_LIBDIR as "lib" in the case of bundle
set(CMAKE_INSTALL_LIBDIR "lib")
endif()

include(GNUInstallDirs)
include(CMakePackageConfigHelpers)

add_subdirectory(src)
add_subdirectory(examples)
add_subdirectory(tests)
Expand Down

0 comments on commit 7c946ef

Please sign in to comment.