build is now robust to presence of inc/GL in CUDA toolkit sample dire…

…ctory
uscresl · Jun 26, 2017 · bdc2ea4 · bdc2ea4
1 parent 445b75e
commit bdc2ea4
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -223,9 +223,17 @@ set(CUDA_NVCC_FLAGS "-arch=sm_35" "--use_fast_math"  "-O3" "--ptxas-options=--ve
 
 # add library
 if(CUDA_FOUND)
-    include_directories(${CUDA_TOOLKIT_ROOT_DIR}/samples/common/inc)
+    #include_directories(${CUDA_TOOLKIT_ROOT_DIR}/samples/common)
+
+    add_custom_target(linkTarget COMMAND ln -sf ${CUDA_TOOLKIT_ROOT_DIR}/samples/common/inc/helper_math.h ${PROJECT_SOURCE_DIR}/src/util/helper_math.h)
+
     add_definitions(-DCUDA_BUILD)
     cuda_add_library(${PROJECT_NAME} ${dart_src} ${point_cloud_srcs} ${depth_source_src} ${gpu_specific_src})
+    add_dependencies(${PROJECT_NAME} linkTarget)
+
+    message(STATUS "ln -s ${CUDA_TOOLKIT_ROOT_DIR}/samples/common/inc/helper_math.h ${PROJECT_SOURCE_DIR}/src/util/helper_math.h")
+
+
 else()
     add_library(${PROJECT_NAME} ${dart_src} ${point_cloud_srcs} ${depth_source_src} ${cpu_specific_src})
 endif()
@@ -267,4 +275,5 @@ if(${BUILD_TESTS} AND ${GTEST_FOUND})
                 ${gpu_test_sources}
     )
     target_link_libraries(test dart)
+
 endif()
diff --git a/src/geometry/geometry.cpp b/src/geometry/geometry.cpp
@@ -6,7 +6,7 @@
 #include <map>
 #include <iostream>
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 #include <Eigen/Eigen>
 
 namespace dart {

diff --git a/src/geometry/grid_3d.h b/src/geometry/grid_3d.h
@@ -8,7 +8,7 @@
 
 #include <vector_types.h>
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 #include "util/vector_type_template.h"
 #include "util/prefix.h"

diff --git a/src/geometry/plane_fitting.cu b/src/geometry/plane_fitting.cu
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <stdio.h>
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {
 

diff --git a/src/img_proc/organized_point_cloud.cu b/src/img_proc/organized_point_cloud.cu
@@ -2,7 +2,7 @@
 
 #include <iostream>
 #include <stdio.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {
 

diff --git a/src/img_proc/resampling.cu b/src/img_proc/resampling.cu
@@ -2,7 +2,7 @@
 
 #include <iostream>
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {
 

diff --git a/src/mesh/mesh_sample.cpp b/src/mesh/mesh_sample.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {
 

diff --git a/src/mesh/primitive_meshing.cpp b/src/mesh/primitive_meshing.cpp
@@ -8,7 +8,7 @@
 
 #include <vector_types.h>
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {
 

diff --git a/src/optimization/kernels/kernel_common.h b/src/optimization/kernels/kernel_common.h
@@ -5,7 +5,7 @@
 #include "util/dart_types.h"
 
 #include <vector_functions.h>
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {
 

diff --git a/src/visualization/gradient_viz.cu b/src/visualization/gradient_viz.cu
@@ -1,6 +1,6 @@
 #include "gradient_viz.h"
 
-#include <helper_math.h>
+#include <util/helper_math.h>
 
 namespace dart {