Update references and fix version inclusion

Author: ruberith

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 "99fa1fe052f353b33957948f36e628500f1737f7"
 	   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
 	)

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 "4c27e1cc88be828c6ac5b8a05759ac7e01cf79e9"
 	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}
 )

CMakeLists.txt

@@ -40,6 +40,9 @@ endif()
 ## Eigen3 is used by most of the libraries that follow
 find_package(Eigen3 REQUIRED)
 add_definitions(-DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT)
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter${EIGEN3_INCLUDE_DIR}")
+endif()
 
 ################################################################################
 # own external libraries

Utilities/CMakeLists.txt

@@ -29,5 +29,9 @@ add_library(Utilities
 )
 
 add_dependencies(Utilities partio zlib)
-target_include_directories(Utilities PUBLIC ${TOPLEVEL_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR})
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	target_compile_options(Utilities PUBLIC -idirafter${TOPLEVEL_INCLUDE_DIR} -idirafter${EIGEN3_INCLUDE_DIR})
+else()
+	target_include_directories(Utilities PUBLIC ${TOPLEVEL_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR})
+endif()
 target_link_libraries(Utilities INTERFACE partio zlib MD5)