From 296172d38550a372c00dc4cef569acbaee15b3d7 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Wed, 15 Jul 2015 14:28:10 -0700 Subject: [PATCH] java: append -fpermissive to CMAKE_CXX_FLAGS rather than override Signed-off-by: Mihai Tudor Panu Signed-off-by: Brendan Le Foll --- src/java/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt index 1ce63a6..824fa4a 100644 --- a/src/java/CMakeLists.txt +++ b/src/java/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories ( set_source_files_properties (mraajava.i PROPERTIES SWIG_FLAGS ";-package;mraa;-I${CMAKE_BINARY_DIR}/src") set_source_files_properties (mraajava.i PROPERTIES CPLUSPLUS ON) -set (CMAKE_CXX_FLAGS "-fpermissive") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") set (JAVAC $ENV{JAVA_HOME}/bin/javac) set (JAR $ENV{JAVA_HOME}/bin/jar)