Skip to content

Commit 5df7c25

Browse files
committed
Revert "Try sth a bit more sophisticated"
This reverts commit 6d0f3b4da11fada94103e01e7436668ccf5af5b2.
1 parent 7d61a31 commit 5df7c25

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

include/picongpu/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -599,10 +599,6 @@ foreach(target picongpu picongpu-hostonly)
599599
# Workaround for this bug https://github.com/nlohmann/json/issues/3907
600600
# We don't need ranges in <nlohmann/json.hpp>
601601
target_compile_definitions(${target} PRIVATE JSON_HAS_RANGES=0)
602-
603-
# Automatic detection of std::source_location availability fails
604-
# on Clang 12 through 14
605-
target_compile_definitions(${target} PRIVATE TOML11_DISABLE_SOURCE_LOCATION)
606602
endforeach()
607603

608604
## annotate with RPATH's

thirdParty/toml11/include/toml11/compat.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,13 @@ using void_t = void;
448448
// ----------------------------------------------------------------------------
449449
// (subset of) source_location
450450

451-
#if ! defined(TOML11_DISABLE_SOURCE_LOCATION) && TOML11_CPLUSPLUS_STANDARD_VERSION >= 202002L
451+
#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 202002L
452452
# if __has_include(<source_location>)
453453
# define TOML11_HAS_STD_SOURCE_LOCATION
454454
# endif // has_include
455455
#endif // c++20
456456

457-
#if ! defined(TOML11_DISABLE_SOURCE_LOCATION) && ! defined(TOML11_HAS_STD_SOURCE_LOCATION)
457+
#if ! defined(TOML11_HAS_STD_SOURCE_LOCATION)
458458
# if defined(__GNUC__) && ! defined(__clang__)
459459
# if TOML11_CPLUSPLUS_STANDARD_VERSION >= TOML11_CXX14_VALUE
460460
# if __has_include(<experimental/source_location>)
@@ -464,7 +464,7 @@ using void_t = void;
464464
# endif // GNU g++
465465
#endif // not TOML11_HAS_STD_SOURCE_LOCATION
466466

467-
#if ! defined(TOML11_DISABLE_SOURCE_LOCATION) && ! defined(TOML11_HAS_STD_SOURCE_LOCATION) && ! defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
467+
#if ! defined(TOML11_HAS_STD_SOURCE_LOCATION) && ! defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
468468
# if defined(__GNUC__) && ! defined(__clang__)
469469
# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9))
470470
# define TOML11_HAS_BUILTIN_FILE_LINE 1

0 commit comments

Comments
 (0)