diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2022-04-17 14:38:20 -0700 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2022-04-17 16:24:12 -0700 |
| commit | 6ba8180534b1010593f9789bdbb758a889354390 (patch) | |
| tree | 0933604d292a546aeb2e4f1f72147b47b756d7f6 /misc/xgboost/files/patch-CMakeLists.txt | |
| parent | dns/amass: Update 3.19.1 -> 3.19.2 (diff) | |
misc/{,py-}xgboost: Update 1.5.2 -> 1.6.0
Reported by: portscout
Diffstat (limited to 'misc/xgboost/files/patch-CMakeLists.txt')
| -rw-r--r-- | misc/xgboost/files/patch-CMakeLists.txt | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/misc/xgboost/files/patch-CMakeLists.txt b/misc/xgboost/files/patch-CMakeLists.txt index 7fbe42423d27..97097cd460c6 100644 --- a/misc/xgboost/files/patch-CMakeLists.txt +++ b/misc/xgboost/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2021-10-15 04:21:04 UTC +--- CMakeLists.txt.orig 2022-04-16 00:43:21 UTC +++ CMakeLists.txt -@@ -104,11 +104,11 @@ endif (PLUGIN_RMM AND NOT ((CMAKE_CXX_COMPILER_ID STRE +@@ -105,11 +105,11 @@ endif (PLUGIN_RMM AND NOT ((CMAKE_CXX_COMPILER_ID STRE if (PLUGIN_RMM AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux")) message(SEND_ERROR "`PLUGIN_RMM` must be used with Linux.") endif (PLUGIN_RMM AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux")) @@ -17,16 +17,16 @@ if (BUILD_STATIC_LIB AND (R_LIB OR JVM_BINDINGS)) message(SEND_ERROR "Cannot build a static library libxgboost.a when R or JVM packages are enabled.") endif (BUILD_STATIC_LIB AND (R_LIB OR JVM_BINDINGS)) -@@ -160,7 +160,7 @@ endif (USE_NCCL) - - # dmlc-core - msvc_use_static_runtime() +@@ -168,7 +168,7 @@ msvc_use_static_runtime() + if (FORCE_SHARED_CRT) + set(DMLC_FORCE_SHARED_CRT ON) + endif () -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) if (MSVC) if (TARGET dmlc_unit_tests) -@@ -177,7 +177,7 @@ endif (RABIT_BUILD_MPI) +@@ -185,7 +185,7 @@ endif (RABIT_BUILD_MPI) # core xgboost add_subdirectory(${xgboost_SOURCE_DIR}/src) @@ -35,7 +35,15 @@ # Exports some R specific definitions and objects if (R_LIB) -@@ -218,7 +218,7 @@ set_target_properties(runxgboost PROPERTIES OUTPUT_NAM +@@ -219,14 +219,14 @@ target_link_libraries(runxgboost PRIVATE objxgboost) + target_include_directories(runxgboost + PRIVATE + ${xgboost_SOURCE_DIR}/include +- ${xgboost_SOURCE_DIR}/dmlc-core/include ++ #${xgboost_SOURCE_DIR}/dmlc-core/include + ${xgboost_SOURCE_DIR}/rabit/include + ) + set_target_properties(runxgboost PROPERTIES OUTPUT_NAME xgboost) #-- End CLI for xgboost # Common setup for all targets @@ -44,7 +52,7 @@ xgboost_target_properties(${target}) xgboost_target_link_libraries(${target}) xgboost_target_defs(${target}) -@@ -269,7 +269,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/include/xgboos +@@ -277,7 +277,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/include/xgboos # # https://github.com/dmlc/xgboost/issues/6085 if (BUILD_STATIC_LIB) |