Skip to content

Commit fc9c949

Browse files
svenwoopsvenwoop
committed
prefixed all embree specific cmake settings with EMBREE_
1 parent ca25f3f commit fc9c949

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+432
-433
lines changed

‎CMakeLists.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -74,42 +74,42 @@ INCLUDE(test)
7474
# Embree configuration
7575
##############################################################
7676

77-
OPTION(ENABLE_STATIC_LIB "Build Embree as a static library." OFF)
78-
IF (ENABLE_STATIC_LIB)
77+
OPTION(EMBREE_STATIC_LIB "Build Embree as a static library." OFF)
78+
IF (EMBREE_STATIC_LIB)
7979
SET(EMBREE_LIB_TYPE STATIC)
80-
ADD_DEFINITIONS(-DENABLE_STATIC_LIB)
80+
ADD_DEFINITIONS(-DEMBREE_STATIC_LIB)
8181
ELSE()
8282
SET(EMBREE_LIB_TYPE SHARED)
8383
ENDIF()
8484

85-
OPTION(ENABLE_ISPC_SUPPORT "Build Embree with support for ISPC applications." ON)
86-
OPTION(ENABLE_TUTORIALS "Enable to build Embree tutorials" ON)
85+
OPTION(EMBREE_ISPC_SUPPORT "Build Embree with support for ISPC applications." ON)
86+
OPTION(EMBREE_TUTORIALS "Enable to build Embree tutorials" ON)
8787

8888
##############################################################################
8989
# Configurations (add configurations also to common/cmake/embree-config-default.cmake)
9090

91-
OPTION(RTCORE_STAT_COUNTERS "Enables statistic counters.")
91+
OPTION(EMBREE_STAT_COUNTERS "Enables statistic counters.")
9292

93-
OPTION(RTCORE_RAY_MASK "Enables ray mask support.")
94-
OPTION(RTCORE_BACKFACE_CULLING "Enables backface culling.")
95-
OPTION(RTCORE_INTERSECTION_FILTER "Enables intersection filter callback." ON)
96-
OPTION(RTCORE_INTERSECTION_FILTER_RESTORE "Restores previous hit when hit is filtered out." ON)
97-
OPTION(RTCORE_IGNORE_INVALID_RAYS "Ignores invalid rays." OFF) # FIXME: enable by default?
93+
OPTION(EMBREE_RAY_MASK "Enables ray mask support.")
94+
OPTION(EMBREE_BACKFACE_CULLING "Enables backface culling.")
95+
OPTION(EMBREE_INTERSECTION_FILTER "Enables intersection filter callback." ON)
96+
OPTION(EMBREE_INTERSECTION_FILTER_RESTORE "Restores previous hit when hit is filtered out." ON)
97+
OPTION(EMBREE_IGNORE_INVALID_RAYS "Ignores invalid rays." OFF) # FIXME: enable by default?
9898

99-
OPTION(RTCORE_GEOMETRY_TRIANGLES "Enables support for triangle geometries." ON)
100-
OPTION(RTCORE_GEOMETRY_QUADS "Enables support for quad geometries." ON)
101-
OPTION(RTCORE_GEOMETRY_LINES "Enables support for line geometries." ON)
102-
OPTION(RTCORE_GEOMETRY_HAIR "Enables support for hair geometries." ON)
103-
OPTION(RTCORE_GEOMETRY_SUBDIV "Enables support for subdiv geometries." ON)
104-
OPTION(RTCORE_GEOMETRY_USER "Enables support for user geometries." ON)
105-
OPTION(RTCORE_RAY_PACKETS "Enabled support for ray packets." ON)
99+
OPTION(EMBREE_GEOMETRY_TRIANGLES "Enables support for triangle geometries." ON)
100+
OPTION(EMBREE_GEOMETRY_QUADS "Enables support for quad geometries." ON)
101+
OPTION(EMBREE_GEOMETRY_LINES "Enables support for line geometries." ON)
102+
OPTION(EMBREE_GEOMETRY_HAIR "Enables support for hair geometries." ON)
103+
OPTION(EMBREE_GEOMETRY_SUBDIV "Enables support for subdiv geometries." ON)
104+
OPTION(EMBREE_GEOMETRY_USER "Enables support for user geometries." ON)
105+
OPTION(EMBREE_RAY_PACKETS "Enabled support for ray packets." ON)
106106

107-
OPTION(RTCORE_ENABLE_RAYSTREAM_LOGGER "Enables ray stream logger.")
107+
OPTION(EMBREE_RAYSTREAM_LOGGER "Enables ray stream logger.")
108108

109-
SET(RTCORE_TASKING_SYSTEM "TBB" CACHE STRING "Selects tasking system")
110-
SET_PROPERTY(CACHE RTCORE_TASKING_SYSTEM PROPERTY STRINGS TBB INTERNAL)
109+
SET(EMBREE_TASKING_SYSTEM "TBB" CACHE STRING "Selects tasking system")
110+
SET_PROPERTY(CACHE EMBREE_TASKING_SYSTEM PROPERTY STRINGS TBB INTERNAL)
111111

112-
IF (RTCORE_TASKING_SYSTEM STREQUAL "TBB")
112+
IF (EMBREE_TASKING_SYSTEM STREQUAL "TBB")
113113
SET(TASKING_TBB ON )
114114
SET(TASKING_INTERNAL OFF)
115115
ELSE()
@@ -185,48 +185,48 @@ ENDIF (WIN32)
185185
##############################################################
186186

187187
IF(APPLE)
188-
SET(XEON_ISA "AVX2" CACHE STRING "Selects highest ISA to support.")
188+
SET(EMBREE_MAX_ISA "AVX2" CACHE STRING "Selects highest ISA to support.")
189189
ELSEIF(NOT COMPILER STREQUAL "ICC")
190-
SET(XEON_ISA "AVX2" CACHE STRING "Selects highest ISA to support.")
190+
SET(EMBREE_MAX_ISA "AVX2" CACHE STRING "Selects highest ISA to support.")
191191
ELSE()
192-
SET(XEON_ISA "AVX512KNL" CACHE STRING "Selects highest ISA to support.")
192+
SET(EMBREE_MAX_ISA "AVX512KNL" CACHE STRING "Selects highest ISA to support.")
193193
ENDIF ()
194194

195-
SET_PROPERTY(CACHE XEON_ISA PROPERTY STRINGS SSE2 SSE3 SSSE3 SSE4.1 SSE4.2 AVX AVX-I AVX2 AVX512KNL)
195+
SET_PROPERTY(CACHE EMBREE_MAX_ISA PROPERTY STRINGS SSE2 SSE3 SSSE3 SSE4.1 SSE4.2 AVX AVX-I AVX2 AVX512KNL)
196196

197-
IF (XEON_ISA STREQUAL "SSE2")
197+
IF (EMBREE_MAX_ISA STREQUAL "SSE2")
198198
SET(ISA 1)
199199
ENDIF ()
200200

201-
IF (XEON_ISA STREQUAL "SSE3")
201+
IF (EMBREE_MAX_ISA STREQUAL "SSE3")
202202
SET(ISA 2)
203203
ENDIF ()
204204

205-
IF (XEON_ISA STREQUAL "SSSE3")
205+
IF (EMBREE_MAX_ISA STREQUAL "SSSE3")
206206
SET(ISA 3)
207207
ENDIF ()
208208

209-
IF (XEON_ISA STREQUAL "SSE4.1")
209+
IF (EMBREE_MAX_ISA STREQUAL "SSE4.1")
210210
SET(ISA 4)
211211
ENDIF ()
212212

213-
IF (XEON_ISA STREQUAL "SSE4.2")
213+
IF (EMBREE_MAX_ISA STREQUAL "SSE4.2")
214214
SET(ISA 5)
215215
ENDIF ()
216216

217-
IF (XEON_ISA STREQUAL "AVX")
217+
IF (EMBREE_MAX_ISA STREQUAL "AVX")
218218
SET(ISA 6)
219219
ENDIF ()
220220

221-
IF (XEON_ISA STREQUAL "AVX-I")
221+
IF (EMBREE_MAX_ISA STREQUAL "AVX-I")
222222
SET(ISA 7)
223223
ENDIF ()
224224

225-
IF (XEON_ISA STREQUAL "AVX2")
225+
IF (EMBREE_MAX_ISA STREQUAL "AVX2")
226226
SET(ISA 8)
227227
ENDIF ()
228228

229-
IF (XEON_ISA STREQUAL "AVX512KNL")
229+
IF (EMBREE_MAX_ISA STREQUAL "AVX512KNL")
230230
SET(ISA 9)
231231
ENDIF ()
232232

@@ -292,7 +292,7 @@ INCLUDE_DIRECTORIES_ISPC("${PROJECT_BINARY_DIR}")
292292
ADD_SUBDIRECTORY(common)
293293
ADD_SUBDIRECTORY(kernels)
294294

295-
IF (ENABLE_TUTORIALS)
295+
IF (EMBREE_TUTORIALS)
296296
ADD_SUBDIRECTORY(tutorials)
297297
ADD_SUBDIRECTORY(tests)
298298
ENDIF()

‎common/cmake/FindTBB.cmake‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
## ======================================================================== ##
1616

1717
IF (WIN32)
18-
FIND_PATH(TBB_ROOT include/tbb/tbb.h
18+
FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h
1919
DOC "Root of TBB installation"
2020
PATHS ${PROJECT_SOURCE_DIR}/tbb "C:/Program Files (x86)/Intel/Composer XE/tbb"
2121
NO_DEFAULT_PATH
2222
)
23-
FIND_PATH(TBB_ROOT include/tbb/tbb.h)
23+
FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h)
2424

2525
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
2626
SET(TBB_ARCH intel64)
@@ -36,32 +36,32 @@ IF (WIN32)
3636
SET(TBB_VCVER vc12)
3737
ENDIF()
3838

39-
SET(TBB_LIBDIR ${TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER})
40-
SET(TBB_BINDIR ${TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER})
39+
SET(TBB_LIBDIR ${EMBREE_TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER})
40+
SET(TBB_BINDIR ${EMBREE_TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER})
4141

42-
IF (TBB_ROOT STREQUAL "")
42+
IF (EMBREE_TBB_ROOT STREQUAL "")
4343
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
4444
FIND_LIBRARY(TBB_LIBRARY tbb)
4545
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc)
4646
ELSE()
4747
SET(TBB_INCLUDE_DIR TBB_INCLUDE_DIR-NOTFOUND)
4848
SET(TBB_LIBRARY TBB_LIBRARY-NOTFOUND)
4949
SET(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
50-
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
50+
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
5151
FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
5252
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_LIBDIR} NO_DEFAULT_PATH)
5353
ENDIF()
5454

5555
ELSE ()
5656

57-
FIND_PATH(TBB_ROOT include/tbb/tbb.h
57+
FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h
5858
DOC "Root of TBB installation"
5959
PATHS ${PROJECT_SOURCE_DIR}/tbb /opt/intel/composerxe/tbb
6060
NO_DEFAULT_PATH
6161
)
62-
FIND_PATH(TBB_ROOT include/tbb/tbb.h)
62+
FIND_PATH(EMBREE_TBB_ROOT include/tbb/tbb.h)
6363

64-
IF (TBB_ROOT STREQUAL "")
64+
IF (EMBREE_TBB_ROOT STREQUAL "")
6565
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h)
6666
FIND_LIBRARY(TBB_LIBRARY tbb)
6767
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc)
@@ -70,13 +70,13 @@ ELSE ()
7070
SET(TBB_LIBRARY TBB_LIBRARY-NOTFOUND)
7171
SET(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
7272
IF (APPLE)
73-
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
74-
FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
75-
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
73+
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
74+
FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${EMBREE_TBB_ROOT}/lib NO_DEFAULT_PATH)
75+
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${EMBREE_TBB_ROOT}/lib NO_DEFAULT_PATH)
7676
ELSE()
77-
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
78-
FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${TBB_ROOT}/lib/intel64/gcc4.4 ${TBB_ROOT}/lib ${TBB_ROOT}/lib64 NO_DEFAULT_PATH)
79-
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib/intel64/gcc4.4 ${TBB_ROOT}/lib ${TBB_ROOT}/lib64 NO_DEFAULT_PATH)
77+
FIND_PATH(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${EMBREE_TBB_ROOT}/include NO_DEFAULT_PATH)
78+
FIND_LIBRARY(TBB_LIBRARY tbb PATHS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4 ${EMBREE_TBB_ROOT}/lib ${EMBREE_TBB_ROOT}/lib64 NO_DEFAULT_PATH)
79+
FIND_LIBRARY(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4 ${EMBREE_TBB_ROOT}/lib ${EMBREE_TBB_ROOT}/lib64 NO_DEFAULT_PATH)
8080
ENDIF()
8181
ENDIF()
8282

@@ -101,10 +101,10 @@ MARK_AS_ADVANCED(TBB_LIBRARY_MALLOC)
101101
IF (WIN32)
102102
INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT examples)
103103
INSTALL(PROGRAMS ${TBB_BINDIR}/tbb.dll ${TBB_BINDIR}/tbbmalloc.dll DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
104-
ELSEIF (RTCORE_ZIP_MODE)
104+
ELSEIF (EMBREE_ZIP_MODE)
105105
IF (APPLE)
106-
INSTALL(PROGRAMS ${TBB_ROOT}/lib/libtbb.dylib ${TBB_ROOT}/lib/libtbbmalloc.dylib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
106+
INSTALL(PROGRAMS ${EMBREE_TBB_ROOT}/lib/libtbb.dylib ${EMBREE_TBB_ROOT}/lib/libtbbmalloc.dylib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
107107
ELSE()
108-
INSTALL(PROGRAMS ${TBB_ROOT}/lib/intel64/gcc4.4/libtbb.so.2 ${TBB_ROOT}/lib/intel64/gcc4.4/libtbbmalloc.so.2 DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
108+
INSTALL(PROGRAMS ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4/libtbb.so.2 ${EMBREE_TBB_ROOT}/lib/intel64/gcc4.4/libtbbmalloc.so.2 DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
109109
ENDIF()
110110
ENDIF()

‎common/cmake/embree-config-default.cmake‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,25 @@ SET(EMBREE_VERSION_MINOR @EMBREE_VERSION_MINOR@)
2020
SET(EMBREE_VERSION_PATCH @EMBREE_VERSION_PATCH@)
2121
SET(EMBREE_VERSION_NOTE "@EMBREE_VERSION_NOTE@")
2222

23-
SET(EMBREE_ISA @XEON_ISA@)
24-
SET(EMBREE_XEON_PHI_SUPPORT @ENABLE_XEON_PHI_SUPPORT@)
23+
SET(EMBREE_ISA @EMBREE_MAX_ISA@)
2524
SET(EMBREE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
26-
SET(EMBREE_ISPC_SUPPORT @ENABLE_ISPC_SUPPORT@)
27-
SET(EMBREE_STATIC_LIB @ENABLE_STATIC_LIB@)
28-
SET(EMBREE_TUTORIALS @ENABLE_TUTORIALS@)
25+
SET(EMBREE_ISPC_SUPPORT @EMBREE_ISPC_SUPPORT@)
26+
SET(EMBREE_STATIC_LIB @EMBREE_STATIC_LIB@)
27+
SET(EMBREE_TUTORIALS @EMBREE_TUTORIALS@)
2928

30-
SET(EMBREE_RAY_MASK @RTCORE_RAY_MASK@)
31-
SET(EMBREE_STAT_COUNTERS @RTCORE_STAT_COUNTERS@)
32-
SET(EMBREE_BACKFACE_CULLING @RTCORE_BACKFACE_CULLING@)
33-
SET(EMBREE_INTERSECTION_FILTER @RTCORE_INTERSECTION_FILTER@)
34-
SET(EMBREE_INTERSECTION_FILTER_RESTORE @RTCORE_INTERSECTION_FILTER_RESTORE@)
35-
SET(EMBREE_ENABLE_RAYSTREAM_LOGGER @RTCORE_ENABLE_RAYSTREAM_LOGGER@)
36-
SET(EMBREE_IGNORE_INVALID_RAYS @RTCORE_IGNORE_INVALID_RAYS@)
37-
SET(EMBREE_TASKING_SYSTEM @RTCORE_TASKING_SYSTEM@)
29+
SET(EMBREE_RAY_MASK @EMBREE_RAY_MASK@)
30+
SET(EMBREE_STAT_COUNTERS @EMBREE_STAT_COUNTERS@)
31+
SET(EMBREE_BACKFACE_CULLING @EMBREE_BACKFACE_CULLING@)
32+
SET(EMBREE_INTERSECTION_FILTER @EMBREE_INTERSECTION_FILTER@)
33+
SET(EMBREE_INTERSECTION_FILTER_RESTORE @EMBREE_INTERSECTION_FILTER_RESTORE@)
34+
SET(EMBREE_RAYSTREAM_LOGGER @EMBREE_RAYSTREAM_LOGGER@)
35+
SET(EMBREE_IGNORE_INVALID_RAYS @EMBREE_IGNORE_INVALID_RAYS@)
36+
SET(EMBREE_TASKING_SYSTEM @EMBREE_TASKING_SYSTEM@)
3837

39-
SET(EMBREE_GEOMETRY_TRIANGLES @RTCORE_GEOMETRY_TRIANGLES@)
40-
SET(EMBREE_GEOMETRY_QUADS @RTCORE_GEOMETRY_QUADS@)
41-
SET(EMBREE_GEOMETRY_LINES @RTCORE_GEOMETRY_LINES@)
42-
SET(EMBREE_GEOMETRY_HAIR @RTCORE_GEOMETRY_HAIR@)
43-
SET(EMBREE_GEOMETRY_SUBDIV @RTCORE_GEOMETRY_SUBDIV@)
44-
SET(EMBREE_GEOMETRY_USER @RTCORE_GEOMETRY_USER@)
45-
SET(EMBREE_RAY_PACKETS @RTCORE_RAY_PACKETS@)
38+
SET(EMBREE_GEOMETRY_TRIANGLES @EMBREE_GEOMETRY_TRIANGLES@)
39+
SET(EMBREE_GEOMETRY_QUADS @EMBREE_GEOMETRY_QUADS@)
40+
SET(EMBREE_GEOMETRY_LINES @EMBREE_GEOMETRY_LINES@)
41+
SET(EMBREE_GEOMETRY_HAIR @EMBREE_GEOMETRY_HAIR@)
42+
SET(EMBREE_GEOMETRY_SUBDIV @EMBREE_GEOMETRY_SUBDIV@)
43+
SET(EMBREE_GEOMETRY_USER @EMBREE_GEOMETRY_USER@)
44+
SET(EMBREE_RAY_PACKETS @EMBREE_RAY_PACKETS@)

‎common/cmake/embree-config-linux.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SET(EMBREE_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_SHARED_LIBRARY_PREFIX@
1919
SET(EMBREE_LIBRARY_XEONPHI ${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_SHARED_LIBRARY_PREFIX@embree_xeonphi@CMAKE_SHARED_LIBRARY_SUFFIX@.@EMBREE_CONFIG_VERSION@)
2020

2121
SET(EMBREE_TASKING_TBB @TASKING_TBB@)
22-
SET(EMBREE_USE_PACKAGED_TBB @RTCORE_ZIP_MODE@)
22+
SET(EMBREE_USE_PACKAGED_TBB @EMBREE_ZIP_MODE@)
2323

2424
IF (${EMBREE_TASKING_TBB} AND ${EMBREE_USE_PACKAGED_TBB})
2525
SET(EMBREE_TBB_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_SHARED_LIBRARY_PREFIX@tbb@CMAKE_SHARED_LIBRARY_SUFFIX@)

‎common/cmake/ispc.cmake‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ MACRO (INCLUDE_DIRECTORIES_ISPC)
2323
SET(ISPC_INCLUDE_DIR ${ISPC_INCLUDE_DIR} ${ARGN})
2424
ENDMACRO ()
2525

26-
IF (ENABLE_ISPC_SUPPORT)
26+
IF (EMBREE_ISPC_SUPPORT)
2727

2828
SET(ISPC_VERSION_REQUIRED "1.8.2")
2929

30-
IF (NOT ISPC_EXECUTABLE)
30+
IF (NOT EMBREE_ISPC_EXECUTABLE)
3131
# try sibling folder as hint for path of ISPC
3232
IF (APPLE)
3333
SET(ISPC_DIR_SUFFIX "osx")
@@ -38,24 +38,24 @@ IF (NOT ISPC_EXECUTABLE)
3838
ENDIF()
3939
SET(ISPC_DIR_HINT ${PROJECT_SOURCE_DIR}/../ispc-v${ISPC_VERSION_REQUIRED}-${ISPC_DIR_SUFFIX})
4040

41-
FIND_PROGRAM(ISPC_EXECUTABLE ispc PATHS ${ISPC_DIR_HINT} DOC "Path to the ISPC executable.")
42-
IF (NOT ISPC_EXECUTABLE)
43-
MESSAGE(FATAL_ERROR "Intel SPMD Compiler (ISPC) not found. Disable ENABLE_ISPC_SUPPORT or install ISPC.")
41+
FIND_PROGRAM(EMBREE_ISPC_EXECUTABLE ispc PATHS ${ISPC_DIR_HINT} DOC "Path to the ISPC executable.")
42+
IF (NOT EMBREE_ISPC_EXECUTABLE)
43+
MESSAGE(FATAL_ERROR "Intel SPMD Compiler (ISPC) not found. Disable EMBREE_ISPC_SUPPORT or install ISPC.")
4444
ELSE()
45-
MESSAGE(STATUS "Found Intel SPMD Compiler (ISPC): ${ISPC_EXECUTABLE}")
45+
MESSAGE(STATUS "Found Intel SPMD Compiler (ISPC): ${EMBREE_ISPC_EXECUTABLE}")
4646
ENDIF()
4747
ENDIF()
4848

4949
# check ISPC version
50-
EXECUTE_PROCESS(COMMAND ${ISPC_EXECUTABLE} --version OUTPUT_VARIABLE ISPC_OUTPUT)
50+
EXECUTE_PROCESS(COMMAND ${EMBREE_ISPC_EXECUTABLE} --version OUTPUT_VARIABLE ISPC_OUTPUT)
5151
STRING(REGEX MATCH " ([0-9]+[.][0-9]+[.][0-9]+)(dev|knl)? " DUMMY "${ISPC_OUTPUT}")
5252
SET(ISPC_VERSION ${CMAKE_MATCH_1})
5353

5454
IF (ISPC_VERSION VERSION_LESS ISPC_VERSION_REQUIRED)
5555
MESSAGE(FATAL_ERROR "Need at least version ${ISPC_VERSION_REQUIRED} of Intel SPMD Compiler (ISPC).")
5656
ENDIF()
5757

58-
GET_FILENAME_COMPONENT(ISPC_DIR ${ISPC_EXECUTABLE} PATH)
58+
GET_FILENAME_COMPONENT(ISPC_DIR ${EMBREE_ISPC_EXECUTABLE} PATH)
5959

6060
SET(EMBREE_ISPC_ADDRESSING 32 CACHE INT "32vs64 bit addressing in ispc")
6161
MARK_AS_ADVANCED(EMBREE_ISPC_ADDRESSING)
@@ -129,7 +129,7 @@ MACRO (ISPC_COMPILE)
129129
ADD_CUSTOM_COMMAND(
130130
OUTPUT ${results} ${ISPC_TARGET_DIR}/${fname}_ispc.h
131131
COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
132-
COMMAND ${ISPC_EXECUTABLE}
132+
COMMAND ${EMBREE_ISPC_EXECUTABLE}
133133
-I ${CMAKE_CURRENT_SOURCE_DIR}
134134
${ISPC_INCLUDE_DIR_PARMS}
135135
--arch=${ISPC_ARCHITECTURE}
@@ -151,7 +151,7 @@ MACRO (ISPC_COMPILE)
151151
ENDFOREACH()
152152
ENDMACRO()
153153

154-
MACRO (ADD_ISPC_EXECUTABLE name)
154+
MACRO (ADD_EMBREE_ISPC_EXECUTABLE name)
155155
SET(ISPC_SOURCES "")
156156
SET(OTHER_SOURCES "")
157157
FOREACH(src ${ARGN})
@@ -181,7 +181,7 @@ MACRO (ADD_ISPC_LIBRARY name type)
181181
ADD_LIBRARY(${name} ${type} ${ISPC_OBJECTS} ${OTHER_SOURCES})
182182
ENDMACRO()
183183

184-
ELSE (ENABLE_ISPC_SUPPORT)
184+
ELSE (EMBREE_ISPC_SUPPORT)
185185

186186
MACRO (ADD_ISPC_LIBRARY name type)
187187
SET(ISPC_SOURCES "")
@@ -197,4 +197,4 @@ MACRO (ADD_ISPC_LIBRARY name type)
197197
ADD_LIBRARY(${name} ${type} ${OTHER_SOURCES})
198198
ENDMACRO()
199199

200-
ENDIF (ENABLE_ISPC_SUPPORT)
200+
ENDIF (EMBREE_ISPC_SUPPORT)

0 commit comments

Comments
 (0)