qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [1/2] qpid-proton git commit: NO-JIRA: Fix over-modern cmake usage in perl binding/c++ examples.
Date Wed, 27 Apr 2016 21:07:10 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 616fe02dd -> 75faa18e9


NO-JIRA: Fix over-modern cmake usage in perl binding/c++ examples.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/587f0d04
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/587f0d04
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/587f0d04

Branch: refs/heads/master
Commit: 587f0d04c95579d559c55eb95651f6216a33dae5
Parents: 616fe02
Author: Alan Conway <aconway@redhat.com>
Authored: Wed Apr 27 15:42:23 2016 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Wed Apr 27 16:15:26 2016 -0400

----------------------------------------------------------------------
 examples/cpp/CMakeLists.txt           |  2 +-
 proton-c/bindings/perl/CMakeLists.txt | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/587f0d04/examples/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index f79c8d2..5804573 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(ProtonCpp REQUIRED)
 
 include_directories(${ProtonCpp_INCLUDE_DIRS})
 link_libraries(${ProtonCpp_LIBRARIES})
-add_compile_options(${CXX_WARNING_FLAGS})
+add_definitions(${CXX_WARNING_FLAGS})
 
 # Single-threaded examples.
 foreach(example

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/587f0d04/proton-c/bindings/perl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/perl/CMakeLists.txt b/proton-c/bindings/perl/CMakeLists.txt
index 4930a43..33aa63a 100644
--- a/proton-c/bindings/perl/CMakeLists.txt
+++ b/proton-c/bindings/perl/CMakeLists.txt
@@ -17,24 +17,24 @@
 # under the License.
 #
 
+# Always need to treat SWIG files as C
+set_source_files_properties(cproton.i perl.i PROPERTIES CPLUSPLUS NO)
+
+# Need to pass in the same compiler flags used to build Perl itself
+execute_process(COMMAND perl -MConfig -e "print \$Config{ccflags}"
+  OUTPUT_VARIABLE PERLCFLAGS)
+
 # Disable harmlesss warnings from the generted perlPERL_wrap.c
 include(CheckCCompilerFlag)
 foreach(flag -Wno-unused-but-set-variable -Wno-unused-function -Wno-unused-variable)
   check_c_compiler_flag(${flag} allowed)
   if (allowed)
-    add_compile_options(${flag})
+    set(PERLCFLAGS "${PERLCFLAGS} ${flag}")
   endif()
 endforeach()
 
 include_directories("${PERL_INCLUDE_PATH}")
 
-# Always need to treat SWIG files as C
-set_source_files_properties(cproton.i perl.i PROPERTIES CPLUSPLUS NO)
-
-# Need to pass in the same compiler flags used to build Perl itself
-execute_process(COMMAND perl -MConfig -e "print \$Config{ccflags}"
-                OUTPUT_VARIABLE PERLCFLAGS)
-
 if (CHECK_SYSINSTALL_PERL)
   execute_process(COMMAND perl -V:installvendorarch
     OUTPUT_VARIABLE PERL_VENDORARCH_OUTPUT_VARIABLE


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message