qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [27/41] qpid-proton git commit: NO-JIRA: [c, cpp] Put source directories first in include_directories
Date Wed, 04 Jul 2018 15:57:59 GMT
NO-JIRA: [c,cpp] Put source directories first in include_directories

CMake copies header files to the build tree to simplify binding builds.
For C and C++ builds, make sure we use the ones from the source tree first.


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

Branch: refs/heads/go1
Commit: 8a6d7ea762e9463bdbdf316361b231f62c487232
Parents: d15cbd8
Author: Alan Conway <aconway@redhat.com>
Authored: Tue Jun 12 15:47:25 2018 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Wed Jun 13 13:46:09 2018 -0400

----------------------------------------------------------------------
 c/CMakeLists.txt   | 3 ++-
 cpp/CMakeLists.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8a6d7ea7/c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
index cb95a7c..a55a80c 100644
--- a/c/CMakeLists.txt
+++ b/c/CMakeLists.txt
@@ -57,9 +57,10 @@ foreach (sfile ${headers})
 endforeach ()
 
 include_directories (
+  "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src"
   ${PN_C_INCLUDE_DIR}
   "${CMAKE_CURRENT_BINARY_DIR}/src"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src"
   )
 
 add_custom_command (

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8a6d7ea7/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index a9ff90c..491394b 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -89,9 +89,10 @@ set(CXX_EXAMPLE_FLAGS "${CXX_WARNING_FLAGS} ${CMAKE_CXX_FLAGS} ${CXX_STANDARD}"
 set(CXX_EXAMPLE_LINK_FLAGS "${SANITIZE_FLAGS}" CACHE INTERNAL "")
 
 include_directories (
-  "${PN_C_INCLUDE_DIR}"
+  "${CMAKE_SOURCE_DIR}/c/include"
   "${CMAKE_SOURCE_DIR}/c/src" # Here because of a naughty looking dependency on message-internal.h
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  "${PN_C_INCLUDE_DIR}"
   "${CMAKE_CURRENT_BINARY_DIR}"
   )
 


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


Mime
View raw message