From 0f38760d154e10bd006ea90f0422b0b8795c2c11 Mon Sep 17 00:00:00 2001 From: MHS-Achyut Boggaram <59655673+mhs-achyut@users.noreply.github.com> Date: Mon, 15 Jun 2020 15:54:44 -0400 Subject: [PATCH 1/2] update deps to fix a build bug --- cmake/Dependencies.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 3e3eae4aa..c71ac3d49 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -281,6 +281,7 @@ if(APPLE OR WIN32) else() set(LIBDIR lib64) endif() +set(LIBDIR ${CMAKE_INSTALL_LIBDIR}) # ---[ MKLDNN if(DEFINED ENV{MKLDNNROOT}) From 4f4af33c573904e705999ee26773bb69c07ccfc6 Mon Sep 17 00:00:00 2001 From: MHS-Achyut Boggaram <59655673+mhs-achyut@users.noreply.github.com> Date: Mon, 15 Jun 2020 15:56:13 -0400 Subject: [PATCH 2/2] fixed a build bug --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f1477c8e..df6010271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,7 @@ add_definitions(-DCAFFE_VERSION=${CAFFE_TARGET_VERSION}) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) include(ExternalProject) -if(MSVC) include(GNUInstallDirs) -endif() include(cmake/Utils.cmake) include(cmake/Targets.cmake)