@@ -325,7 +325,7 @@ if (NOT COVISE_BUILD_ONLY_FILE)
325325 COVISE_FIND_PACKAGE (OpenSSL )
326326 set (OpenGL_GL_PREFERENCE LEGACY)
327327 COVISE_FIND_PACKAGE (OpenGL )
328- COVISE_FIND_PACKAGE (OpenXR )
328+ COVISE_FIND_PACKAGE (OpenXR CONFIG )
329329 COVISE_FIND_PACKAGE (GLEW ) # virvo depends on it
330330 if (NOT GLEW_FOUND)
331331 set (COVISE_USE_VIRVO OFF )
@@ -337,17 +337,17 @@ if (NOT COVISE_BUILD_ONLY_FILE)
337337 COVISE_FIND_PACKAGE (XERCESC REQUIRED )
338338 COVISE_FIND_PACKAGE (ZLIB REQUIRED )
339339 COVISE_FIND_PACKAGE (JPEGTURBO )
340+ if (NOT JPEGTURBO_FOUND)
341+ COVISE_FIND_PACKAGE (JPEG REQUIRED )
342+ endif ()
340343
341344 covise_find_package (Freetype )
342345 covise_find_package (CURL )
343- covise_find_package (glslang 15 )
346+ covise_find_package (glslang 15 CONFIG )
344347 covise_find_package (Vulkan 1.1.70 )
345- covise_find_package (vsg 1.1.4 )
346- covise_find_package (vsgXchange 1.0.5 )
347- covise_find_package (vsgPoints 0.6.0 )
348- if (NOT JPEGTURBO_FOUND)
349- COVISE_FIND_PACKAGE (JPEG REQUIRED )
350- endif ()
348+ covise_find_package (vsg 1.1.4 CONFIG )
349+ covise_find_package (vsgXchange 1.0.5 CONFIG )
350+ covise_find_package (vsgPoints 0.6.0 CONFIG )
351351 COVISE_FIND_PACKAGE (PNG REQUIRED )
352352 COVISE_FIND_PACKAGE (TIFF REQUIRED )
353353 if (NOT COVISE_BUILD_ONLY_ODDLOT)
0 commit comments