Disable profiling as the default option when using MSVC #3066
Conversation
|
Retest this please. |
tpls/gtest/gtest/gtest.h
Outdated
| @@ -48,6 +48,8 @@ | |||
| // registration from Barthelemy Dagenais' (barthelemy@prologique.com) | |||
| // easyUnit framework. | |||
|
|
|||
| #define GTEST_HAS_TR1_TUPLE 0 | |||
There was a problem hiding this comment.
Did you consider conditionally adding the definition from CMake?
There was a problem hiding this comment.
Yes, I'm indifferent about that.
There was a problem hiding this comment.
You must
- either clearly comment that you added that line and state why you did so (the commit message does not contain any useful information)
- or conditionally add a compile definition to the
kokkos_gtesttarget
There was a problem hiding this comment.
I believe the right thing to do is the compile definition.
We already add -DGTEST_HAS_PTHREAD=0
kokkos/core/unit_test/CMakeLists.txt
Lines 17 to 22 in 785d19f
dalg24
changed the title
Co-authored-by: Damien L-G <dalg24+github@gmail.com>
cmake/kokkos_tpls.cmake
Outdated
| @@ -13,7 +13,12 @@ KOKKOS_TPL_OPTION(LIBNUMA Off) | |||
| KOKKOS_TPL_OPTION(MEMKIND Off) | |||
| KOKKOS_TPL_OPTION(CUDA Off) | |||
| KOKKOS_TPL_OPTION(LIBRT Off) | |||
| KOKKOS_TPL_OPTION(LIBDL On) | |||
| MESSAGE(STATUS "COMPILER ID ${CMAKE_CXX_COMPILER_ID}") | |||
| IF (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") | |||
There was a problem hiding this comment.
how about if(WIN32)? That would also catch the "we use nvcc as the compiler on windows" case
Codecov Report
@@ Coverage Diff @@
## develop #3066 +/- ##
=========================================
+ Coverage 82.6% 83.1% +0.5%
=========================================
Files 122 122
Lines 8074 8485 +411
=========================================
+ Hits 6674 7058 +384
- Misses 1400 1427 +27
Continue to review full report at Codecov.
|
Co-authored-by: Damien L-G <dalg24+github@gmail.com>
Partly following up on #2977. In particular, I also need da39c79 to compile with
clang-cl.