Author: aconway
Date: Wed Dec 17 15:05:41 2014
New Revision: 1646276
URL: http://svn.apache.org/r1646276
Log:
NO-JIRA: Fix problem with config.h.in introduced by recent commit.
- Separate config.h.in for router and src subdirs, only define what is needed
for each.
- Remove src/ from include_directories for router subdir, not needed, shouldn't
be used.
- Remove unused conditionals.h.in
Added:
qpid/dispatch/trunk/router/src/config.h.in
- copied, changed from r1646062, qpid/dispatch/trunk/src/config.h.in
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/router/CMakeLists.txt
qpid/dispatch/trunk/src/CMakeLists.txt
qpid/dispatch/trunk/src/config.h.in
qpid/dispatch/trunk/src/container.c
qpid/dispatch/trunk/tests/CMakeLists.txt
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1646276&r1=1646275&r2=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Wed Dec 17 15:05:41 2014
@@ -86,11 +86,12 @@ find_library(dl_lib dl)
find_library(rt_lib rt)
find_path(proton_include proton/driver.h)
+##
+## Include directories used by all sub-directories.
+##
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}/src
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/src
+ ${CMAKE_CURRENT_BINARY_DIR}/include
${proton_include}
${PYTHON_INCLUDE_PATH}
)
@@ -107,9 +108,6 @@ add_compile_options(-Werror)
add_compile_options(-std=gnu99)
set(CATCH_UNDEFINED "-Wl,--no-undefined")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/conditionals.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/conditionals.h)
-
##
## Header file installation
##
Modified: qpid/dispatch/trunk/router/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/router/CMakeLists.txt?rev=1646276&r1=1646275&r2=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/router/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/router/CMakeLists.txt Wed Dec 17 15:05:41 2014
@@ -21,6 +21,8 @@
set(DEFAULT_CONFIG_PATH "${QPID_DISPATCH_CONFDIR}/qdrouterd.conf" CACHE string
"Default config file path")
set(DEFAULT_DISPATCH_PYTHON_DIR ${QPID_DISPATCH_PYTHON_DIR})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
include_directories(${CMAKE_CURRENT_BINARY_DIR})
##
Copied: qpid/dispatch/trunk/router/src/config.h.in (from r1646062,
qpid/dispatch/trunk/src/config.h.in)
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/router/src/config.h.in?p2=qpid/dispatch/trunk/router/src/config.h.in&p1=qpid/dispatch/trunk/src/config.h.in&r1=1646062&r2=1646276&rev=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/config.h.in (original)
+++ qpid/dispatch/trunk/router/src/config.h.in Wed Dec 17 15:05:41 2014
@@ -17,8 +17,6 @@
* under the License.
*/
-#define DEFAULT_CONFIG_PATH "${DEFAULT_CONFIG_PATH}"
-#define QPID_DISPATCH_HOME_INSTALLED "${QPID_DISPATCH_HOME_INSTALLED}"
-#define QPID_DISPATCH_LIB "${QPID_DISPATCH_LIB}"
-
+#cmakedefine DEFAULT_CONFIG_PATH "${DEFAULT_CONFIG_PATH}"
+#cmakedefine QPID_DISPATCH_HOME_INSTALLED "${QPID_DISPATCH_HOME_INSTALLED}"
Modified: qpid/dispatch/trunk/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/CMakeLists.txt?rev=1646276&r1=1646275&r2=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/src/CMakeLists.txt Wed Dec 17 15:05:41 2014
@@ -17,8 +17,6 @@
## under the License.
##
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
# Generate code from the management schema.
set(GENERATED_SOURCES
schema_enum.h
@@ -38,6 +36,11 @@ add_custom_command (
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/tests/run.py -s
${CMAKE_CURRENT_SOURCE_DIR}/schema_c.py
DEPENDS ${GENERATOR_DEPENDS})
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
# Build the qpid-dispatch library.
set(qpid_dispatch_SOURCES
alloc.c
@@ -85,6 +88,7 @@ set_target_properties(qpid-dispatch PROP
install(TARGETS qpid-dispatch
LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-set (QPID_DISPATCH_LIB "libqpid-dispatch.so.${SO_VERSION_MAJOR}")
-
+# Set in parent scope for calling cmake file.
+set (QPID_DISPATCH_LIB "libqpid-dispatch.so.${SO_VERSION_MAJOR}" PARENT_SCOPE)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/config.h)
Modified: qpid/dispatch/trunk/src/config.h.in
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/config.h.in?rev=1646276&r1=1646275&r2=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/config.h.in (original)
+++ qpid/dispatch/trunk/src/config.h.in Wed Dec 17 15:05:41 2014
@@ -17,8 +17,6 @@
* under the License.
*/
-#define DEFAULT_CONFIG_PATH "${DEFAULT_CONFIG_PATH}"
-#define QPID_DISPATCH_HOME_INSTALLED "${QPID_DISPATCH_HOME_INSTALLED}"
#define QPID_DISPATCH_LIB "${QPID_DISPATCH_LIB}"
Modified: qpid/dispatch/trunk/src/container.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/container.c?rev=1646276&r1=1646275&r2=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/container.c (original)
+++ qpid/dispatch/trunk/src/container.c Wed Dec 17 15:05:41 2014
@@ -32,7 +32,6 @@
#include <qpid/dispatch/threading.h>
#include <qpid/dispatch/iterator.h>
#include <qpid/dispatch/log.h>
-#include "conditionals.h"
/** Instance of a node type in a container */
struct qd_node_t {
Modified: qpid/dispatch/trunk/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/CMakeLists.txt?rev=1646276&r1=1646275&r2=1646276&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/tests/CMakeLists.txt Wed Dec 17 15:05:41 2014
@@ -25,6 +25,11 @@ if (VALGRIND_FOUND)
option(USE_VALGRIND "Use valgrind when running tests" OFF)
endif(VALGRIND_FOUND)
+include_directories(
+ ${CMAKE_SOURCE_DIR}/src
+ ${CMAKE_BINARY_DIR}/src
+ )
+
##
## Build test applications
##
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
