Skip to content

Commit 8e861be

Browse files
CMakeLists health updates
Signed-off-by: Michael R Carroll <[email protected]>
1 parent bc62f20 commit 8e861be

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

RenderingToolkit/GettingStarted/03_openvkl_gsg/CMakeLists.txt

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,31 @@ cmake_minimum_required(VERSION 3.16)
22
project(OPENVKL_GSG LANGUAGES C CXX)
33

44
set(ONEAPI_ROOT "")
5-
if($ENV{ONEAPI_ROOT})
6-
set(ONEAPI_ROOT $ENV{ONEAPI_ROOT})
5+
if(DEFINED ENV{ONEAPI_ROOT})
6+
set(ONEAPI_ROOT "$ENV{ONEAPI_ROOT}")
7+
message(STATUS "ONEAPI_ROOT FROM ENVIRONMENT: ${ONEAPI_ROOT}")
78
else()
8-
if(WIN32)
9-
set(ONEAPI_ROOT "C:/Program Files (x86)/Intel/oneAPI")
10-
else()
11-
set(ONEAPI_ROOT /opt/intel/oneapi)
12-
endif()
13-
endif($ENV{ONEAPI_ROOT})
9+
if(WIN32)
10+
set(ONEAPI_ROOT "C:/Program Files (x86)/Intel/oneAPI")
11+
else()
12+
set(ONEAPI_ROOT /opt/intel/oneapi)
13+
endif()
14+
message(STATUS "ONEAPI_ROOT DEFAULT: ${ONEAPI_ROOT}")
15+
endif(DEFINED ENV{ONEAPI_ROOT})
1416

1517
set(OPENVKL_ROOT ${ONEAPI_ROOT}/openvkl/latest)
1618
set(OPENVKL_INCLUDE_DIR ${OPENVKL_ROOT}/include)
1719
message(STATUS "OPENVKL_INCLUDE_DIR: ${OPENVKL_INCLUDE_DIR}")
18-
message(STATUS "ONEAPI_ROOT: ${ONEAPI_ROOT}")
1920
find_package(openvkl REQUIRED PATHS ${ONEAPI_ROOT})
2021

22+
if(MSVC)
23+
set(CMAKE_CXX_STANDARD 11)
24+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
25+
set(CMAKE_CXX_EXTENSIONS OFF)
26+
else()
27+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
28+
endif(MSVC)
29+
2130
include_directories(${OPENVKL_INCLUDE_DIR} ${ONEAPI_ROOT}/rkcommon/latest/include)
2231
link_directories(${OPENVKL_ROOT}/lib)
2332

0 commit comments

Comments
 (0)