diff --git a/CMake/NeighborhoodSearch.cmake b/CMake/NeighborhoodSearch.cmake
index de87929c..3c258583 100644
--- a/CMake/NeighborhoodSearch.cmake
+++ b/CMake/NeighborhoodSearch.cmake
@@ -20,6 +20,8 @@ if(USE_GPU_NEIGHBORHOOD_SEARCH)
 	   GIT_TAG "aba3da18cb4f45cd05d729465d1725891ffc33da"
 	   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 -DCUNSEARCH_USE_DOUBLE_PRECISION:BOOL=${USE_DOUBLE_PRECISION} -DBUILD_DEMO:BOOL=OFF
+	   BUILD_BYPRODUCTS ${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}cuNSearch${LIB_SUFFIX}
+	   ${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}cuNSearch_d${LIB_SUFFIX}
 	   )
 
 	set(NEIGHBORHOOD_ASSEMBLY_NAME cuNSearch)
@@ -36,6 +38,8 @@ else(USE_GPU_NEIGHBORHOOD_SEARCH)
 	   GIT_TAG "3f11ece16a419fc1cc5795d6aa87cb7fe6b86960"
 	   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
+	   BUILD_BYPRODUCTS ${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}CompactNSearch${LIB_SUFFIX}
+	   ${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}CompactNSearch_d${LIB_SUFFIX}
 	)
 	set(NEIGHBORHOOD_ASSEMBLY_NAME CompactNSearch)
 
diff --git a/CMake/SetUpExternalProjects.cmake b/CMake/SetUpExternalProjects.cmake
index 93d054ce..1fcc7b7c 100644
--- a/CMake/SetUpExternalProjects.cmake
+++ b/CMake/SetUpExternalProjects.cmake
@@ -17,6 +17,8 @@ ExternalProject_Add(
 	GIT_TAG "0b69062ff9c56fbb6dcecd296652028bedbacf0e"
 	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}
+	BUILD_BYPRODUCTS ${ExternalInstallDir}/Discregrid/lib/${LIB_PREFIX}Discregrid${LIB_SUFFIX}
+	${ExternalInstallDir}/Discregrid/lib/${LIB_PREFIX}Discregrid_d${LIB_SUFFIX}
 )
 ExternalProject_Get_Property(Ext_Discregrid INSTALL_DIR)
 set(DISCREGRID_INCLUDE_DIR ${INSTALL_DIR}/include)
@@ -36,6 +38,7 @@ ExternalProject_Add(
 	GIT_TAG "42d52ad551fafba600ee99e59fb0f9c7b557e2ed"
 	INSTALL_DIR ${ExternalInstallDir}/GenericParameters
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/GenericParameters -DGENERICPARAMETERS_NO_TESTS:BOOL=1 -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+	BUILD_BYPRODUCTS ${ExternalInstallDir}/GenericParameters/include
 )
 ExternalProject_Get_Property(Ext_GenericParameters INSTALL_DIR)
 set(GENERICPARAMETERS_INCLUDE_DIR ${INSTALL_DIR}/include)
@@ -60,6 +63,12 @@ ExternalProject_Add(
 	-DDiscregrid_DEBUG_LIB:FILEPATH=${DISCREGRID_DEBUG_LIB}
 	-DDiscregrid_LIB:FILEPATH=${DISCREGRID_LIB}
 	-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+	BUILD_BYPRODUCTS ${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Simulation${LIB_SUFFIX}
+	${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}PositionBasedDynamics${LIB_SUFFIX}
+	${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Utils${LIB_SUFFIX}
+	${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Simulation_d${LIB_SUFFIX}
+	${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}PositionBasedDynamics_d${LIB_SUFFIX}
+	${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Utils_d${LIB_SUFFIX}
 )
 ExternalProject_Get_Property(Ext_PBD INSTALL_DIR)
 set(PBD_INCLUDE_DIR ${INSTALL_DIR}/include)