- updated CompactNSearch

janbender · janbender · commit 6bf568b7f0c7 · 2025-08-12T15:21:45.000+02:00
- updated DiscreGrid
diff --git a/CMake/NeighborhoodSearch.cmake b/CMake/NeighborhoodSearch.cmake
@@ -33,7 +33,7 @@ else(USE_GPU_NEIGHBORHOOD_SEARCH)
 	   Ext_NeighborhoodSearch
 	   PREFIX "${CMAKE_BINARY_DIR}/extern/CompactNSearch"
 	   GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/CompactNSearch.git
-	   GIT_TAG "3f11ece16a419fc1cc5795d6aa87cb7fe6b86960"
+	   GIT_TAG "f6c0f32f3946554c91561cbaec4cfe8be0c23430"
 	   INSTALL_DIR ${ExternalInstallDir}/NeighborhoodSearch
 	   CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/NeighborhoodSearch -DUSE_DOUBLE_PRECISION:BOOL=${USE_DOUBLE_PRECISION} -DBUILD_DEMO:BOOL=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
 	)
diff --git a/CMake/SetUpExternalProjects.cmake b/CMake/SetUpExternalProjects.cmake
@@ -14,7 +14,7 @@ ExternalProject_Add(
 	Ext_Discregrid
 	PREFIX "${CMAKE_BINARY_DIR}/extern/Discregrid"
 	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/Discregrid.git
-	GIT_TAG "0b69062ff9c56fbb6dcecd296652028bedbacf0e"
+	GIT_TAG "ddf20dc0480874bf02e0bdc6ded76c1f101b17fb"
 	INSTALL_DIR ${ExternalInstallDir}/Discregrid
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/Discregrid -DBUILD_CMD_EXECUTABLE:BOOL=0 -DEIGEN3_INCLUDE_DIR:PATH=${EIGEN3_INCLUDE_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
 )
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,7 @@
+2.14.1
+	- updated CompactNSearch
+	- updated DiscreGrid
+
 2.14.0
 	- Fixed CI for Python wheels (thanks to Stefan Jeske)
 	- Implemented alternative (Blender style) camera controls (thanks to Fabian Löschner)
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.14.0
+2.14.1

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ else(USE_GPU_NEIGHBORHOOD_SEARCH)`
`33`	`33`	`Ext_NeighborhoodSearch`
`34`	`34`	`PREFIX "${CMAKE_BINARY_DIR}/extern/CompactNSearch"`
`35`	`35`	`GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/CompactNSearch.git`
`36`		`- GIT_TAG "3f11ece16a419fc1cc5795d6aa87cb7fe6b86960"`
	`36`	`+ GIT_TAG "f6c0f32f3946554c91561cbaec4cfe8be0c23430"`
`37`	`37`	`INSTALL_DIR ${ExternalInstallDir}/NeighborhoodSearch`
`38`	`38`	`CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/NeighborhoodSearch -DUSE_DOUBLE_PRECISION:BOOL=${USE_DOUBLE_PRECISION} -DBUILD_DEMO:BOOL=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ ExternalProject_Add(`
`14`	`14`	`Ext_Discregrid`
`15`	`15`	`PREFIX "${CMAKE_BINARY_DIR}/extern/Discregrid"`
`16`	`16`	`GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/Discregrid.git`
`17`		`- GIT_TAG "0b69062ff9c56fbb6dcecd296652028bedbacf0e"`
	`17`	`+ GIT_TAG "ddf20dc0480874bf02e0bdc6ded76c1f101b17fb"`
`18`	`18`	`INSTALL_DIR ${ExternalInstallDir}/Discregrid`
`19`	`19`	`CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/Discregrid -DBUILD_CMD_EXECUTABLE:BOOL=0 -DEIGEN3_INCLUDE_DIR:PATH=${EIGEN3_INCLUDE_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}`
`20`	`20`	`)`