summaryrefslogtreecommitdiff
path: root/misc/mxnet/files/patch-CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'misc/mxnet/files/patch-CMakeLists.txt')
-rw-r--r--misc/mxnet/files/patch-CMakeLists.txt46
1 files changed, 0 insertions, 46 deletions
diff --git a/misc/mxnet/files/patch-CMakeLists.txt b/misc/mxnet/files/patch-CMakeLists.txt
deleted file mode 100644
index bc3fb3a0fefa..000000000000
--- a/misc/mxnet/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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)