Skip to content
This repository was archived by the owner on Mar 21, 2024. It is now read-only.

Various CMake fixes for new build features #1781

Merged
alliepiper merged 2 commits into from
Aug 30, 2022
Merged

Various CMake fixes for new build features #1781

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f58f28c
Only generate per-dialect targets when needed.
Aug 30, 2022
73a4616
Fix FindTBB.cmake for MSVC 2022.
Aug 30, 2022
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
Prev Previous commit
Fix FindTBB.cmake for MSVC 2022.
  • Loading branch information
Allison Vacanti committed Aug 30, 2022
commit 73a461625acd40cb83f27f5213ad4fd57a214dca
3 changes: 2 additions & 1 deletion thrust/cmake/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,12 @@ if (WIN32 AND MSVC)
set(COMPILER_PREFIX "vc11")
elseif(MSVC_VERSION EQUAL 1800)
set(COMPILER_PREFIX "vc12")
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS_EQUAL 1929)
elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS_EQUAL 1939)
# 1900-1925 actually spans three Visual Studio versions:
# 1900 = VS 14.0 (v140 toolset) a.k.a. MSVC 2015
# 1910-1919 = VS 15.0 (v141 toolset) a.k.a. MSVC 2017
# 1920-1929 = VS 16.0 (v142 toolset) a.k.a. MSVC 2019
# 1930-1939 = VS 17.0 (v143 toolset) a.k.a. MSVC 2022
#
# But these are binary compatible and TBB's open source distribution only
# ships a single vs14 lib (as of 2020.0)
Expand Down