diff options
Diffstat (limited to 'misc/py-xgboost/files/patch-CMakeLists.txt')
| -rw-r--r-- | misc/py-xgboost/files/patch-CMakeLists.txt | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/misc/py-xgboost/files/patch-CMakeLists.txt b/misc/py-xgboost/files/patch-CMakeLists.txt index e0dc0a32ba4f..bffe795898ed 100644 --- a/misc/py-xgboost/files/patch-CMakeLists.txt +++ b/misc/py-xgboost/files/patch-CMakeLists.txt @@ -1,26 +1,34 @@ ---- ../CMakeLists.txt.orig 2019-12-14 20:50:22 UTC +--- ../CMakeLists.txt.orig 2020-09-24 08:09:24 UTC +++ ../CMakeLists.txt -@@ -101,16 +101,16 @@ endif (USE_CUDA) +@@ -131,11 +131,11 @@ add_subdirectory(${xgboost_SOURCE_DIR}/src) # dmlc-core msvc_use_static_runtime() -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) -set_target_properties(dmlc PROPERTIES -- CXX_STANDARD 11 +- CXX_STANDARD 14 - CXX_STANDARD_REQUIRED ON - POSITION_INDEPENDENT_CODE ON) --list(APPEND LINKED_LIBRARIES_PRIVATE dmlc) +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) +#set_target_properties(dmlc PROPERTIES -+# CXX_STANDARD 11 ++# CXX_STANDARD 14 +# CXX_STANDARD_REQUIRED ON +# POSITION_INDEPENDENT_CODE ON) -+#list(APPEND LINKED_LIBRARIES_PRIVATE dmlc) + if (MSVC) + target_compile_options(dmlc PRIVATE + -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) +@@ -144,10 +144,10 @@ if (MSVC) + -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) + endif (TARGET dmlc_unit_tests) + endif (MSVC) +-if (ENABLE_ALL_WARNINGS) +- target_compile_options(dmlc PRIVATE -Wall -Wextra) +-endif (ENABLE_ALL_WARNINGS) +-target_link_libraries(objxgboost PUBLIC dmlc) ++#if (ENABLE_ALL_WARNINGS) ++# target_compile_options(dmlc PRIVATE -Wall -Wextra) ++#endif (ENABLE_ALL_WARNINGS) ++#target_link_libraries(objxgboost PUBLIC dmlc) # rabit set(RABIT_BUILD_DMLC OFF) --set(DMLC_ROOT ${xgboost_SOURCE_DIR}/dmlc-core) -+set(DMLC_ROOT ${CMAKE_INSTALL_PREFIX}) - set(RABIT_WITH_R_LIB ${R_LIB}) - add_subdirectory(rabit) - |