Merge pull request #672 from JdeRobot/frivas_671

#671 fixed cxx flags overwrite
JdeRobot · Jan 26, 2017 · 2d4b409 · 2d4b409
2 parents c3f6e10 + 361c94a
commit 2d4b409
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/drivers/ardrone_server/CMakeLists.txt b/src/drivers/ardrone_server/CMakeLists.txt
@@ -11,7 +11,7 @@ if(ARDRONE_ALL_DEPS)
 	add_library(ardrone_server_msgs STATIC ${SLICE_OUTPUT}/navdatagps.cpp)
 
 
-	set(CMAKE_CXX_FLAGS "-w -lIce -lIceUtil")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -lIce -lIceUtil")
 
 	include_directories(
 		${INTERFACES_CPP_DIR}

diff --git a/src/drivers/openni1Server/CMakeLists.txt b/src/drivers/openni1Server/CMakeLists.txt
@@ -3,7 +3,7 @@ IF(openni_LIBRARIES AND LIBUSB_INCLUDE_DIRS)
 	    SET( SOURCE_FILES openni1Server.cpp myprogeo.cpp )
 	    add_definitions(-DGLADE_DIR="${gladedir}")
 
-	    set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador
+	    set( CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-deprecated" ) # Opciones para el compilador
 
 	    include_directories(
             ${INTERFACES_CPP_DIR}

diff --git a/src/drivers/openniServer/CMakeLists.txt b/src/drivers/openniServer/CMakeLists.txt
@@ -10,7 +10,7 @@ IF(OPENNI2_LIB)
 	SET( SOURCE_FILES openniServer.cpp myprogeo.cpp )
     add_definitions(-DGLADE_DIR="${gladedir}")
 
-	set( CMAKE_CXX_FLAGS "-Wno-deprecated -Wl,-rpath ./" ) # Opciones para el compilador
+	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wl,-rpath ./" ) # Opciones para el compilador
 
     include_directories(
         ${INTERFACES_CPP_DIR}