Skip to content

Commit e6b4b6d

Browse files
Fix for radeon rays (and disable doxygen by default)
1 parent 0f8e7e5 commit e6b4b6d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

3rdparty/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,8 @@ if (NBL_BUILD_RADEON_RAYS)
422422

423423
set(RADEON_RAYS_DEPENDENTS
424424
RadeonRays
425+
CLW
426+
Calc
425427
)
426428
set(RADEON_RAYS_DEPENDENTS ${RADEON_RAYS_DEPENDENTS} PARENT_SCOPE)
427429
set(RADEON_RAYS_DEPENDENT_LIBS
@@ -445,9 +447,7 @@ if (NBL_COMPILE_WITH_CUDA)
445447
endif()
446448

447449
set(NBL_3RDPARTY_TARGETS
448-
RadeonRays
449-
CLW
450-
Calc
450+
${RADEON_RAYS_DEPENDENTS}
451451
lzma
452452
lz4
453453
aesGladman

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ option(NBL_BUILD_CEGUI "Enable CEGUI building and integration?" OFF)
218218

219219
option(NBL_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
220220

221-
option(NBL_BUILD_DOCS "Enable building documentation?" ON)
221+
option(NBL_BUILD_DOCS "Enable building documentation?" OFF) # No one has doxygen installed, plus we dont know when was the last time we generated working doxy and we'll use SphinX in the future
222222

223223
set(THIRD_PARTY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty")
224224
set(THIRD_PARTY_BINARY_DIR "${PROJECT_BINARY_DIR}/3rdparty")
@@ -246,4 +246,4 @@ endif()
246246

247247
if(NBL_BUILD_DOCS)
248248
add_subdirectory(docs)
249-
endif()
249+
endif()

0 commit comments

Comments
 (0)