You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2013/09/12 19:39:36 UTC
svn commit: r1522678 - in /qpid/proton/trunk/proton-c: CMakeLists.txt
src/libqpid-proton.cmake.in
Author: chug
Date: Thu Sep 12 17:39:36 2013
New Revision: 1522678
URL: http://svn.apache.org/r1522678
Log:
PROTON-413: Support for finding an installed proton that works on windows
Use in conjunction with commit associated with QPID-5103.
1. In proton: cmake -DCMAKE_INSTALL_PREFIX=P:/install ...
2. devenv proton.sln /build "Debug|Win32" /project INSTALL
3. In qpid: cmake -DPROTON_ROOT=P:/install ...
4. devenv qpid-cpp.sln /build "Debug|Win32 /project INSTALL
Added:
qpid/proton/trunk/proton-c/src/libqpid-proton.cmake.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=1522678&r1=1522677&r2=1522678&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Thu Sep 12 17:39:36 2013
@@ -322,7 +322,12 @@ endmacro(pn_c_files)
pn_c_files (${qpid-proton-core} ${qpid-proton-platform} src/proton.c src/proton-dump.c)
# Install executables and libraries
-install (TARGETS proton proton-dump qpid-proton
+install (TARGETS proton proton-dump
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION bin
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+install (TARGETS qpid-proton
+ EXPORT proton
RUNTIME DESTINATION bin
ARCHIVE DESTINATION bin
LIBRARY DESTINATION ${LIB_INSTALL_DIR})
@@ -355,6 +360,15 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI
${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.pc @ONLY)
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
+ ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.cmake @ONLY)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libqpid-proton.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
Added: qpid/proton/trunk/proton-c/src/libqpid-proton.cmake.in
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/libqpid-proton.cmake.in?rev=1522678&view=auto
==============================================================================
--- qpid/proton/trunk/proton-c/src/libqpid-proton.cmake.in (added)
+++ qpid/proton/trunk/proton-c/src/libqpid-proton.cmake.in Thu Sep 12 17:39:36 2013
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Name: Proton
+# Description: Qpid Proton C library
+# Version: @PN_VERSION@
+# URL: http://qpid.apache.org/proton/
+
+set (PROTON_FOUND "True")
+set (PROTON_VERSION @PN_VERSION@)
+set (PROTON_INCLUDE_DIRS "@INCLUDEDIR@")
+set (PROTON_LIBRARY_DIRS "@PREFIX@/bin")
+set (PROTON_LIBRARIES "qpid-proton")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org