Merge lp:~neric27/midori/cflags_in_c_extensions into lp:midori

[Eric Le Lay]

Set proper CFLAGS for vala and c files when compiling extensions

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt	2014-03-01 17:55:02 +0000
+++ extensions/CMakeLists.txt	2014-03-02 16:17:23 +0000
@@ -69,12 +69,20 @@
             target_link_libraries(${UNIT_SRC}
                                   ${LIBMIDORI}
                                   )
-            set_target_properties(${UNIT_SRC} PROPERTIES
-                                  COMPILE_FLAGS ${VALA_CFLAGS}
-                                  )
             install(TARGETS ${UNIT_SRC}
                     LIBRARY DESTINATION ${EXTENSIONDIR}
                     )
+            # extensions with vala code get the lenient VALA_CFLAGS
+            # others get the usual CFLAGS with -Wall and -Werror
+	    if (UNIT_FILES_VALA)
+		set_target_properties(${UNIT_SRC} PROPERTIES
+				      COMPILE_FLAGS ${VALA_CFLAGS}
+				      )
+	    else ()
+		set_target_properties(${UNIT_SRC} PROPERTIES
+				      COMPILE_FLAGS ${CFLAGS}
+				      )
+	    endif ()
         endif ()
     endif ()
 endforeach ()