qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1526673 - /qpid/proton/trunk/proton-c/CMakeLists.txt
Date Thu, 26 Sep 2013 20:37:15 GMT
Author: chug
Date: Thu Sep 26 20:37:15 2013
New Revision: 1526673

URL: http://svn.apache.org/r1526673
Log:
PROTON-430: cmake files written to wrong place(s)
Add white space to make file names more visible


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=1526673&r1=1526672&r2=1526673&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Thu Sep 26 20:37:15 2013
@@ -356,19 +356,30 @@ pn_pkgconfig_dir(EXEC_PREFIX ${INSTALL_P
 pn_pkgconfig_dir(LIBDIR ${LIB_INSTALL_DIR} ${INSTALL_PREFIX})
 pn_pkgconfig_dir(INCLUDEDIR ${INCLUDE_INSTALL_DIR} ${INSTALL_PREFIX})
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libqpid-proton.pc.in
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/libqpid-proton.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.pc @ONLY)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.pc
+install (FILES 
+  ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.pc
   DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libqpid-proton.cmake.in
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/libqpid-proton.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.cmake @ONLY)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.cmake
+install (FILES 
+  ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.cmake
+  DESTINATION ${LIB_INSTALL_DIR}/proton.cmake)
+
+install (EXPORT proton 
+  FILE proton-config.cmake 
+  DESTINATION ${LIB_INSTALL_DIR}/proton.cmake)
+
+file(WRITE 
+  ${CMAKE_CURRENT_BINARY_DIR}/proton.cmake/proton-config-version.cmake
+  "set(PACKAGE_VERSION ${PN_VERSION})\n")
+install (FILES 
+  ${CMAKE_CURRENT_BINARY_DIR}/proton.cmake/proton-config-version.cmake
   DESTINATION ${LIB_INSTALL_DIR}/proton.cmake)
-install (EXPORT proton FILE proton-config.cmake DESTINATION lib/proton.cmake)
-file(WRITE ${LIB_INSTALL_DIR}/proton.cmake/proton-config-version.cmake
-    "set(PACKAGE_VERSION ${PN_VERSION})\n")
-install (FILES ${LIB_INSTALL_DIR}/proton.cmake/proton-config-version.cmake
-    DESTINATION lib/proton.cmake)
 
 # CTest
 



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


Mime
View raw message