Skip to content

Commit 4a337ff

Browse files
committed
Remove dev build defs for /Zc:preprocessor and /Zc:__cplusplus.
These are no longer needed since the public libcudacxx target now adds them.
1 parent e966a8c commit 4a337ff

File tree

4 files changed

+0
-22
lines changed

4 files changed

+0
-22
lines changed

cmake/CCCLBuildCompilerTargets.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ function(cccl_build_compiler_targets)
153153
# See https://github.com/microsoft/STL/issues/696
154154
append_option_if_available("/wd4494" cxx_compile_options)
155155

156-
# Require the conforming preprocessor
157-
append_option_if_available("/Zc:preprocessor" cxx_compile_options)
158156
if (MSVC_TOOLSET_VERSION LESS 143)
159157
# winbase.h(9572): warning C5105: macro expansion producing 'defined' has undefined behavior
160158
append_option_if_available("/wd5105" cxx_compile_options)

cudax/cmake/cudaxBuildCompilerTargets.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ if ("MSVC" STREQUAL "${CMAKE_CXX_COMPILER_ID}")
4242
# C4848: support for attribute 'msvc::no_unique_address' in C++17 and earlier is a vendor extension
4343
append_option_if_available("/wd4848" cxx_compile_options)
4444

45-
# cudax requires dim3 to be usable from a constexpr context, and the CUDART headers require
46-
# __cplusplus to be defined for this to work:
47-
append_option_if_available("/Zc:__cplusplus" cxx_compile_options)
48-
4945
# XXX Temporary hack for STF !
5046
# C4267: conversion from 'meow' to 'purr', possible loss of data
5147
append_option_if_available("/wd4267" cxx_compile_options)

examples/cudax/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@ if ("MSVC" STREQUAL "${CMAKE_CXX_COMPILER_ID}")
5959
# mdspan on windows only works in C++20 mode
6060
target_compile_features(cudax_samples_interface INTERFACE cxx_std_20)
6161

62-
# Require the conforming preprocessor
63-
target_compile_options(
64-
cudax_samples_interface
65-
INTERFACE
66-
$<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>
67-
$<$<COMPILE_LANGUAGE:CXX>:/Zc:preprocessor>
68-
$<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:-Xcompiler=/Zc:__cplusplus>
69-
$<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:-Xcompiler=/Zc:preprocessor>
70-
)
71-
7262
if (MSVC_TOOLSET_VERSION LESS 143)
7363
# winbase.h(9572): warning C5105: macro expansion producing 'defined' has undefined behavior
7464
target_compile_options(

libcudacxx/cmake/LibcudacxxBuildCompilerTargets.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ function(libcudacxx_build_compiler_targets)
1111
set(cxx_compile_options)
1212
set(cxx_compile_definitions)
1313

14-
if ("MSVC" STREQUAL "${CMAKE_CXX_COMPILER_ID}")
15-
# libcudacxx requires dim3 to be usable from a constexpr context, and the CUDART headers require
16-
# __cplusplus to be defined for this to work:
17-
append_option_if_available("/Zc:__cplusplus" cxx_compile_options)
18-
endif()
19-
2014
# if (CCCL_USE_LIBCXX)
2115
# list(APPEND cxx_compile_options "-stdlib=libc++")
2216
# list(APPEND cxx_compile_definitions "_ALLOW_UNSUPPORTED_LIBCPP=1")

0 commit comments

Comments
 (0)