qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1510511 - in /qpid/proton/trunk/proton-c: CMakeLists.txt include/proton/version.h.in pn_config.h.in
Date Mon, 05 Aug 2013 14:40:43 GMT
Author: rhs
Date: Mon Aug  5 14:40:42 2013
New Revision: 1510511

URL: http://svn.apache.org/r1510511
Log:
moved pn_config.h -> proton/version.h and install it

Added:
    qpid/proton/trunk/proton-c/include/proton/version.h.in
      - copied, changed from r1509515, qpid/proton/trunk/proton-c/pn_config.h.in
Removed:
    qpid/proton/trunk/proton-c/pn_config.h.in
Modified:
    qpid/proton/trunk/proton-c/CMakeLists.txt

Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1510511&r1=1510510&r2=1510511&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Mon Aug  5 14:40:42 2013
@@ -51,8 +51,8 @@ endif(OPENSSL_FOUND)
 set(SSL_IMPL ${ssl_impl} CACHE STRING "Library to use for SSL/TLS support. Valid values:
'none','openssl'")
 
 configure_file (
-  "${CMAKE_CURRENT_SOURCE_DIR}/pn_config.h.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/pn_config.h"
+  "${CMAKE_CURRENT_SOURCE_DIR}/include/proton/version.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/include/proton/version.h"
   )
 
 include_directories ("${CMAKE_CURRENT_BINARY_DIR}")
@@ -316,6 +316,8 @@ install (TARGETS proton proton-dump qpid
 # Install header files
 file(GLOB headers "include/proton/*.[hi]")
 install (FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/proton)
+install (FILES  ${CMAKE_CURRENT_BINARY_DIR}/include/proton/version.h
+         DESTINATION ${INCLUDE_INSTALL_DIR}/proton)
 
 # Pkg config file
 # Compatible variable names used in the pkg config files also for autoconf

Copied: qpid/proton/trunk/proton-c/include/proton/version.h.in (from r1509515, qpid/proton/trunk/proton-c/pn_config.h.in)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/version.h.in?p2=qpid/proton/trunk/proton-c/include/proton/version.h.in&p1=qpid/proton/trunk/proton-c/pn_config.h.in&r1=1509515&r2=1510511&rev=1510511&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/pn_config.h.in (original)
+++ qpid/proton/trunk/proton-c/include/proton/version.h.in Mon Aug  5 14:40:42 2013
@@ -1,5 +1,5 @@
-#ifndef _PROTON_CONFIG_H
-#define _PROTON_CONFIG_H 1
+#ifndef _PROTON_VERSION_H
+#define _PROTON_VERSION_H 1
 
 /*
  *
@@ -25,4 +25,4 @@
 #define PN_VERSION_MAJOR @PN_VERSION_MAJOR@
 #define PN_VERSION_MINOR @PN_VERSION_MINOR@
 
-#endif /* pn_config.h */
+#endif /* version.h */



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


Mime
View raw message