Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.

#671 fixed cxx flags overwrite #672

Merged
fqez merged 1 commit into from
Jan 26, 2017
Merged

#671 fixed cxx flags overwrite #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/drivers/ardrone_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/openni1Server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/openniServer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down