Skip to content

build: Add NOMINMAX definition for MSVC compatibility #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siposcsaba89 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: Add NOMINMAX definition for MSVC compatibility #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions benchmarks/stdgpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ target_compile_options(benchmarkstdgpu PRIVATE ${STDGPU_DEVICE_FLAGS}
${STDGPU_TEST_DEVICE_FLAGS}
${STDGPU_TEST_HOST_FLAGS})

target_compile_definitions(benchmarkstdgpu PRIVATE $<$<PLATFORM_ID:Windows>:NOMINMAX>)

target_link_libraries(benchmarkstdgpu PRIVATE
stdgpu::stdgpu
benchmark::benchmark)
Expand Down
1 change: 1 addition & 0 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ macro(stdgpu_detail_add_example)
target_compile_options(${STDGPU_EXAMPLES_NAME} PRIVATE ${STDGPU_DEVICE_FLAGS}
${STDGPU_HOST_FLAGS})
target_link_libraries(${STDGPU_EXAMPLES_NAME} PRIVATE stdgpu::stdgpu)
target_compile_definitions(${STDGPU_EXAMPLES_NAME} PRIVATE $<$<PLATFORM_ID:Windows>:NOMINMAX>)
set_target_properties(${STDGPU_EXAMPLES_NAME} PROPERTIES CXX_CLANG_TIDY "${STDGPU_PROPERTY_CLANG_TIDY}")
set_target_properties(${STDGPU_EXAMPLES_NAME} PROPERTIES CXX_CPPCHECK "${STDGPU_PROPERTY_CPPCHECK}")
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
Expand Down
2 changes: 2 additions & 0 deletions src/stdgpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ target_compile_features(stdgpu PUBLIC cxx_std_17)
target_compile_options(stdgpu PRIVATE ${STDGPU_DEVICE_FLAGS}
${STDGPU_HOST_FLAGS})

target_compile_definitions(stdgpu PRIVATE $<$<PLATFORM_ID:Windows>:NOMINMAX>)

target_link_libraries(stdgpu PUBLIC thrust::thrust)

set_target_properties(stdgpu PROPERTIES CXX_CLANG_TIDY "${STDGPU_PROPERTY_CLANG_TIDY}")
Expand Down
2 changes: 1 addition & 1 deletion tests/stdgpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ target_compile_options(teststdgpu PRIVATE ${STDGPU_DEVICE_FLAGS}
${STDGPU_HOST_FLAGS}
${STDGPU_TEST_DEVICE_FLAGS}
${STDGPU_TEST_HOST_FLAGS})

target_compile_definitions(teststdgpu PRIVATE $<$<PLATFORM_ID:Windows>:NOMINMAX>)
target_link_libraries(teststdgpu PRIVATE
stdgpu::stdgpu
GTest::gtest)
Expand Down
Loading