Author: astitcher
Date: Tue Jun 3 20:43:16 2014
New Revision: 1599792
URL: http://svn.apache.org/r1599792
Log:
NO-JIRA: Rearrange the C include file directories a little for more consistency
Modified:
qpid/proton/trunk/examples/CMakeLists.txt
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/tests/tools/apps/c/CMakeLists.txt
Modified: qpid/proton/trunk/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/CMakeLists.txt?rev=1599792&r1=1599791&r2=1599792&view=diff
==============================================================================
--- qpid/proton/trunk/examples/CMakeLists.txt (original)
+++ qpid/proton/trunk/examples/CMakeLists.txt Tue Jun 3 20:43:16 2014
@@ -19,4 +19,5 @@
set (Proton_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
add_subdirectory(messenger/c)
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1599792&r1=1599791&r2=1599792&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Tue Jun 3 20:43:16 2014
@@ -58,20 +58,24 @@ configure_file (
"${CMAKE_CURRENT_BINARY_DIR}/include/proton/version.h"
)
-include_directories ("${CMAKE_CURRENT_BINARY_DIR}")
+include_directories ("${CMAKE_CURRENT_BINARY_DIR}/src")
include_directories ("${CMAKE_CURRENT_BINARY_DIR}/include")
+include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/src")
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/include")
-include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../examples/include")
+
+# TODO: This is only needed because the proton executable can use getopt on
windows
+# if/when this executable gets sorted out remove
+include_directories ("${CMAKE_SOURCE_DIR}/examples/include")
add_custom_command (
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/encodings.h
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py
PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/src/codec/encodings.h.py >
${CMAKE_CURRENT_BINARY_DIR}/encodings.h
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/encodings.h
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py
PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/src/codec/encodings.h.py >
${CMAKE_CURRENT_BINARY_DIR}/src/encodings.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/codec/encodings.h.py
)
add_custom_command (
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/protocol.h
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py
PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.h.py >
${CMAKE_CURRENT_BINARY_DIR}/protocol.h
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/protocol.h
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py
PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.h.py >
${CMAKE_CURRENT_BINARY_DIR}/src/protocol.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.h.py
)
@@ -280,8 +284,8 @@ set (qpid-proton-core
src/messenger/transform.c
src/selectable.c
- ${CMAKE_CURRENT_BINARY_DIR}/encodings.h
- ${CMAKE_CURRENT_BINARY_DIR}/protocol.h
+ ${CMAKE_CURRENT_BINARY_DIR}/src/encodings.h
+ ${CMAKE_CURRENT_BINARY_DIR}/src/protocol.h
)
set_source_files_properties (
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1599792&r1=1599791&r2=1599792&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Tue Jun 3 20:43:16 2014
@@ -22,12 +22,12 @@
#if defined(_WIN32) && ! defined(__CYGWIN__)
#define NOGDI
#include <winsock2.h>
-#include "pncompat/misc_funcs.inc"
#else
#include <unistd.h>
-#include <libgen.h>
#endif
+#include "pncompat/misc_funcs.inc"
+
#include <stdio.h>
#include <string.h>
#include <proton/driver.h>
Modified: qpid/proton/trunk/tests/tools/apps/c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/tools/apps/c/CMakeLists.txt?rev=1599792&r1=1599791&r2=1599792&view=diff
==============================================================================
--- qpid/proton/trunk/tests/tools/apps/c/CMakeLists.txt (original)
+++ qpid/proton/trunk/tests/tools/apps/c/CMakeLists.txt Tue Jun 3 20:43:16 2014
@@ -19,6 +19,8 @@
include(CheckIncludeFiles)
+include_directories(${CMAKE_SOURCE_DIR}/examples/include)
+
CHECK_INCLUDE_FILES("inttypes.h" INTTYPES_AVAILABLE)
if (INTTYPES_AVAILABLE)
list(APPEND PLATFORM_DEFINITIONS "USE_INTTYPES")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
