Update references and fix version inclusion

Author: ruberith

CMake/NeighborhoodSearch.cmake

@@ -32,8 +32,8 @@ else(USE_GPU_NEIGHBORHOOD_SEARCH)
 	ExternalProject_Add(
 	   Ext_NeighborhoodSearch
 	   PREFIX "${CMAKE_BINARY_DIR}/extern/CompactNSearch"
-	   GIT_REPOSITORY https://github.com/ruberith/CompactNSearch.git
-	   GIT_TAG "7c5280bc622c28f8bb18491a25852189bd8ffef8"
+	   GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/CompactNSearch.git
+	   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

@@ -13,8 +13,8 @@ include(NeighborhoodSearch)
 ExternalProject_Add(
 	Ext_Discregrid
 	PREFIX "${CMAKE_BINARY_DIR}/extern/Discregrid"
-	GIT_REPOSITORY https://github.com/ruberith/Discregrid.git
-	GIT_TAG "a9364dfc40617dcd1ec794f85ac32de359a11e8f"
+	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/Discregrid.git
+	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}
 )
@@ -46,8 +46,8 @@ include(ExternalProject)
 ExternalProject_Add(
 	Ext_PBD
 	PREFIX "${CMAKE_BINARY_DIR}/extern/PositionBasedDynamics"
-	GIT_REPOSITORY https://github.com/ruberith/PositionBasedDynamics.git
-	GIT_TAG "3bdc9079b8354a8ee2c25c3d842f4e8c96077eb3"
+	GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/PositionBasedDynamics.git
+	GIT_TAG "77298f1eac1246d5302fcdc026db8c6addf50e86"
 	INSTALL_DIR ${ExternalInstallDir}/PositionBasedDynamics
 	DEPENDS Ext_GenericParameters Ext_Discregrid
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE}

CMakeLists.txt

@@ -45,6 +45,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

@@ -5,7 +5,7 @@ if (${GIT_LOCAL_CHANGES} STREQUAL "DIRTY")
 	set(COMPILER_MESSAGE "#pragma WARNING(Local changes not committed.)")
 endif()
 
-file (STRINGS "../version.txt" SPLISHSPLASH_VERSION)
+file (STRINGS "../version" SPLISHSPLASH_VERSION)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Version.h @ONLY)
 
@@ -28,5 +28,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)

extern/eigen/version.txt renamed to extern/eigen/version

@@ -116,7 +116,7 @@ def build_extension(self, ext):
     long_description = f.read()
 
 # read version	
-f = open("version.txt", "r")
+f = open("version", "r")
 splishsplash_version = f.readline().strip()
 f.close()