projects
/
contrib
/
mraa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8609dad
)
java: append -fpermissive to CMAKE_CXX_FLAGS rather than override
author
Mihai Tudor Panu
<mihai.tudor.panu@intel.com>
Wed, 15 Jul 2015 21:28:10 +0000
(14:28 -0700)
committer
Brendan Le Foll
<brendan.le.foll@intel.com>
Thu, 16 Jul 2015 11:01:13 +0000
(12:01 +0100)
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
src/java/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/java/CMakeLists.txt
b/src/java/CMakeLists.txt
index
1ce63a6
..
824fa4a
100644
(file)
--- 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)