Skip to content

Commit 002b06e

Browse files
committed
do not build vive, if only cover was requested
1 parent 1c9c66f commit 002b06e

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,13 @@ if (NOT COVISE_BUILD_ONLY_FILE)
340340

341341
covise_find_package(Freetype)
342342
covise_find_package(CURL)
343+
if (NOT COVISE_BUILD_ONLY_ODDLOT AND NOT COVISE_BUILD_ONLY_COVER)
343344
covise_find_package(glslang 15 CONFIG)
344-
covise_find_package(Vulkan 1.1.70)
345+
covise_find_package(Vulkan 1.1.70)
345346
covise_find_package(vsg 1.1.4 CONFIG)
346347
covise_find_package(vsgXchange 1.0.5 CONFIG)
347348
covise_find_package(vsgPoints 0.6.0 CONFIG)
349+
endif()
348350
COVISE_FIND_PACKAGE(PNG REQUIRED)
349351
COVISE_FIND_PACKAGE(TIFF REQUIRED)
350352
if (NOT COVISE_BUILD_ONLY_ODDLOT)

src/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ IF(COVISE_BUILD_MODULES AND NOT COVISE_BUILD_ONLY_COVER AND NOT COVISE_BUILD_ONL
3030
ADD_SUBDIRECTORY(module)
3131
ENDIF()
3232

33-
if (NOT COVISE_BUILD_ONLY_ODDLOT
34-
AND (COVISE_BUILD_COVER OR COVISE_BUILD_ONLY_COVER))
35-
add_subdirectory(OpenCOVER)
36-
add_subdirectory(VIVE)
33+
if (NOT COVISE_BUILD_ONLY_ODDLOT)
34+
if (COVISE_BUILD_COVER OR COVISE_BUILD_ONLY_COVER)
35+
add_subdirectory(OpenCOVER)
36+
endif()
37+
if (NOT COVISE_BUILD_ONLY_COVER)
38+
add_subdirectory(VIVE)
39+
endif()
3740
endif()
3841

3942
if (COVISE_BUILD_ONLY_ODDLOT OR NOT COVISE_BUILD_ONLY_COVER)

0 commit comments

Comments
 (0)