ports/misc/mxnet/files/patch-CMakeLists.txt
Yuri Victorovich f6a64f1498 misc/{,py-}mxnet: Update 1.8.0 -> 1.9.0
Reported by:	portscout
2021-12-23 13:17:34 -08:00

46 lines
1.6 KiB
Text

--- CMakeLists.txt.orig 2021-11-04 20:30:01 UTC
+++ CMakeLists.txt
@@ -7,7 +7,7 @@ if(CMAKE_CROSSCOMPILING)
endif()
project(mxnet C CXX)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14) # workaround for https://github.com/apache/incubator-mxnet/issues/20784
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON)
@@ -511,6 +511,7 @@ if(USE_JEMALLOC)
endif()
endif()
+if (ENABLE_TESTING)
include(CTest)
set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest")
set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include)
@@ -521,6 +522,7 @@ set(GTEST_LIBRARY gtest)
add_subdirectory(${GTEST_ROOT})
find_package(GTest REQUIRED)
+endif()
# cudnn detection
if(USE_CUDNN)
@@ -974,7 +976,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dlpack/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dmlc-core/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+#install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dmlc-core/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mshadow/mshadow/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mshadow)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/mxnet/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mxnet)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tvm/nnvm/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
@@ -1020,7 +1022,9 @@ if(USE_CPP_PACKAGE)
endif()
endif()
+if(ENABLE_TESTING)
add_subdirectory(tests)
+endif()
# ---[ Linter target
if(MSVC)