Merge pull request #1478 from Algomorph/master

replaced add_definitions calls within PCLConfig.cmake.in with appending PCL_DEFINITIONS
PointCloudLibrary · Aug 22, 2016 · 5d19050 · 5d19050
2 parents 61b038c + 7d3dd9e
commit 5d19050
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
@@ -588,7 +588,7 @@ IF(GLEW_FOUND)
     MESSAGE(STATUS "Found Glew: ${GLEW_LIBRARIES}")
   ENDIF(NOT GLEW_FIND_QUIETLY)
   IF(GLEW_GLEW_LIBRARY MATCHES glew32s)
-    ADD_DEFINITIONS(-DGLEW_STATIC)
+    list(APPEND PCL_DEFINITIONS "-DGLEW_STATIC")
   ENDIF(GLEW_GLEW_LIBRARY MATCHES glew32s)
 ELSE(GLEW_FOUND)
   IF(GLEW_FIND_REQUIRED)
@@ -659,7 +659,7 @@ macro(find_external_library _component _lib _is_optional)
     endif(${LIB}_DEFINITIONS AND NOT ${LIB} STREQUAL "VTK")
   else(${LIB}_FOUND)
     if("${_is_optional}" STREQUAL "OPTIONAL")
-      add_definitions("-DDISABLE_${LIB}")
+      list(APPEND PCL_${COMPONENT}_DEFINITIONS "-DDISABLE_${LIB}")
       pcl_message("** WARNING ** ${_component} features related to ${_lib} will be disabled")
     elseif("${_is_optional}" STREQUAL "REQUIRED")
       if((NOT PCL_FIND_ALL) OR (PCL_FIND_ALL EQUAL 1))