From 3fcce6a68b4097dbd0282e8614bd7aa0717a38b9 Mon Sep 17 00:00:00 2001 From: Joachim Mairboeck Date: Wed, 19 May 2021 11:40:54 +0200 Subject: [PATCH 1/2] CMake: finish OpenVR handling for OpenCASCADE 7.5 (static linking support) --- src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51b8db0..05c8e4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -86,6 +86,7 @@ option(OpenCASCADE_WITH_OPENVR "whether OpenCASCADE was built with OpenVR suppor if(OpenCASCADE_WITH_OPENVR) set(OPENVR_LIBRARY_PREFIX "${OPENCASCADE_PREFIX}/openvr-1.14.15-64/lib/win64" CACHE PATH "OpenVR library directory") set(OPENVR_BIN_PREFIX "${OPENCASCADE_PREFIX}/openvr-1.14.15-64/bin/win64" CACHE PATH "OpenVR binary directory") + option(OPENVR_SHARED "link OpenVR as shared library" ON) endif() if(NOT OpenCASCADE_BUILD_SHARED_LIBS) @@ -101,6 +102,9 @@ if(NOT OpenCASCADE_BUILD_SHARED_LIBS) if(OpenCASCADE_WITH_FREETYPE) link_directories(${FREETYPE_LIBRARY_PREFIX}) endif() + if(OpenCASCADE_WITH_OPENVR) + link_directories(${OPENVR_LIBRARY_PREFIX}) + endif() endif() set(LIBS TKernel TKMath TKBRep TKLCAF TKXDESTEP TKXCAF TKMesh TKTopAlgo TKSTL TKG3d TKG2d TKGeomBase TKCDF TKXSBase TKSTEP TKSTEPBase TKSTEPAttr TKShHealing TKVCAF TKCAF TKService TKV3d TKGeomAlgo TKSTEP209 TKBO TKHLR) @@ -178,7 +182,7 @@ if(INSTALL_DEPENDENCIES) "${FFMPEG_BIN_PREFIX}/avutil-55.dll" TYPE BIN) endif() - if(OpenCASCADE_WITH_OPENVR) + if(OpenCASCADE_WITH_OPENVR AND OPENVR_SHARED) install(FILES "${OPENVR_BIN_PREFIX}/openvr_api.dll" TYPE BIN) From 1ef05739fc26713cc629e6a43951fab79381308d Mon Sep 17 00:00:00 2001 From: Joachim Mairboeck Date: Thu, 20 May 2021 11:10:11 +0200 Subject: [PATCH 2/2] reorder CMakeLists.txt more logically this also happened because of the premature merge of #2 --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 05c8e4b..4a728e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -78,8 +78,6 @@ if(OpenCASCADE_WITH_FREETYPE) option(FREETYPE_SHARED "link FreeType as shared library" ON) endif() -include_directories(${OpenCASCADE_INCLUDE_DIR} ${OCE_INCLUDE_DIRS}) - # OpenCASCADE-config.cmake doesn't define this option yet, so define it here instead option(OpenCASCADE_WITH_OPENVR "whether OpenCASCADE was built with OpenVR support" ON) @@ -89,6 +87,8 @@ if(OpenCASCADE_WITH_OPENVR) option(OPENVR_SHARED "link OpenVR as shared library" ON) endif() +include_directories(${OpenCASCADE_INCLUDE_DIR} ${OCE_INCLUDE_DIRS}) + if(NOT OpenCASCADE_BUILD_SHARED_LIBS) if(OpenCASCADE_WITH_TBB) link_directories(${TBB_LIBRARY_PREFIX})