Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly use UTF-8 codepage when using MSVC (#5197)

Browse Source 
* Explicitly use UTF-8 codepage when using MSVC

* Fix build with CUDA enabled
This commit is contained in:
Philip Hyunsu Cho 2020-01-14 13:30:34 -08:00 committed by GitHub
parent a73e25e15f
commit 0184f2e9f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -33,6 +33,12 @@ if (USE_CUDA)
$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${OpenMP_CXX_FLAGS}> $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=${OpenMP_CXX_FLAGS}>
) )
if (MSVC)
target_compile_options(objxgboost PRIVATE
$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=/utf-8>
)
endif (MSVC)
set_target_properties(objxgboost PROPERTIES set_target_properties(objxgboost PROPERTIES
CUDA_SEPARABLE_COMPILATION OFF) CUDA_SEPARABLE_COMPILATION OFF)
else (USE_CUDA) else (USE_CUDA)
@ -52,6 +58,12 @@ if (WIN32 AND MINGW)
target_compile_options(objxgboost PUBLIC -static-libstdc++) target_compile_options(objxgboost PUBLIC -static-libstdc++)
endif (WIN32 AND MINGW) endif (WIN32 AND MINGW)
if (MSVC)
target_compile_options(objxgboost PRIVATE
$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/utf-8>
)
endif (MSVC)
set_target_properties(objxgboost PROPERTIES set_target_properties(objxgboost PROPERTIES
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ON
CXX_STANDARD 11 CXX_STANDARD 11

11
tests/cpp/CMakeLists.txt
View File

@ -43,8 +43,19 @@ if (USE_CUDA)
target_include_directories(testxgboost PRIVATE "${NVTX_HEADER_DIR}") target_include_directories(testxgboost PRIVATE "${NVTX_HEADER_DIR}")
target_compile_definitions(testxgboost PRIVATE -DXGBOOST_USE_NVTX=1) target_compile_definitions(testxgboost PRIVATE -DXGBOOST_USE_NVTX=1)
endif (USE_NVTX) endif (USE_NVTX)
if (MSVC)
target_compile_options(testxgboost PRIVATE
$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=/utf-8>
)
endif (MSVC)
endif (USE_CUDA) endif (USE_CUDA)
if (MSVC)
target_compile_options(testxgboost PRIVATE
$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/utf-8>
)
endif (MSVC)
target_include_directories(testxgboost target_include_directories(testxgboost
PRIVATE PRIVATE
${GTEST_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}