From 834fd4eb2df782538d5a54f4cdba01610129c3c8 Mon Sep 17 00:00:00 2001 From: Sergen Eren Date: Sun, 3 Oct 2021 15:55:02 -0500 Subject: [PATCH] Houdini 18.5.462 update --- source/CMakeLists.txt | 3 ++- thirdparty/LosTopos/LosTopos3D/collisionpipeline.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 2c084d7..eee2a29 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ #add houdini cmake lists -set(HOUDINI_CMAKE_DIR "C:/Program Files/Side Effects Software/Houdini 17.5.327/toolkit/cmake") +set(HOUDINI_CMAKE_DIR "C:/Program Files/Side Effects Software/Houdini 18.5.462/toolkit/cmake") list( APPEND CMAKE_PREFIX_PATH ${HOUDINI_CMAKE_DIR}) @@ -18,6 +18,7 @@ message(STATUS "Houdini directory: ${Houdini_DIR}") houdini_configure_target( BubbleH ) +set_target_properties(BubbleH PROPERTIES VS_GLOBAL_VcpkgEnabled true) #copy icon to %HOME%/%HOUDINI_VERSION%/config/icons folder diff --git a/thirdparty/LosTopos/LosTopos3D/collisionpipeline.cpp b/thirdparty/LosTopos/LosTopos3D/collisionpipeline.cpp index 0e7956c..5ddda3d 100644 --- a/thirdparty/LosTopos/LosTopos3D/collisionpipeline.cpp +++ b/thirdparty/LosTopos/LosTopos3D/collisionpipeline.cpp @@ -80,7 +80,7 @@ namespace { class CCollisionCandidateSetLT { public: - bool operator () (const Vec3st & a, const Vec3st & b) + bool operator () (const Vec3st & a, const Vec3st & b) const { return CollisionCandidateSetLT(a, b); }