You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/07/24 20:31:42 UTC
svn commit: r1506652 - in /qpid/proton/trunk: CMakeLists.txt
examples/messenger/c/CMakeLists.txt
Author: mcpierce
Date: Wed Jul 24 18:31:42 2013
New Revision: 1506652
URL: http://svn.apache.org/r1506652
Log:
Revert "QPID-364: Install C examples."
This reverts commit 3a584f212234833169ff985d9c15957bf88eae5c.
Modified:
qpid/proton/trunk/CMakeLists.txt
qpid/proton/trunk/examples/messenger/c/CMakeLists.txt
Modified: qpid/proton/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1506652&r1=1506651&r2=1506652&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Wed Jul 24 18:31:42 2013
@@ -69,14 +69,6 @@ set (SYSCONF_INSTALL_DIR etc CACHE PATH
set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
set (MAN_INSTALL_DIR share/man CACHE PATH "Manpage directory")
-if (WIN32)
- set (EXAMPLES_INSTALL_DIR proton/examples)
-endif (WIN32)
-
-if (UNIX)
- set (EXAMPLES_INSTALL_DIR ${SHARE_INSTALL_DIR}/proton/examples)
-endif (UNIX)
-
set (JAVA_INSTALL_DIR ${SHARE_INSTALL_DIR}/java CACHE PATH "Installation directory for all JARs except those using JNI")
set (JNI_INSTALL_DIR ${LIB_INSTALL_DIR}/java CACHE PATH "Installation directory for all JARs utilising JNI")
set (JNI_SHARED_LIB_INSTALL_DIR ${LIB_INSTALL_DIR} CACHE PATH "Installation directory for shared objects used by JNI JARs")
@@ -107,19 +99,6 @@ add_subdirectory(proton-c)
install (FILES LICENSE README TODO
DESTINATION ${PROTON_SHARE})
-# install the C messenger example
-install (FILES examples/messenger/c/CMakeLists.txt
- examples/messenger/c/send.c
- examples/messenger/c/recv.c
- DESTINATION ${EXAMPLES_INSTALL_DIR}/messenger)
-
-install (FILES examples/include/pncompat/internal/LICENSE
- examples/include/pncompat/internal/getopt.c
- examples/include/pncompat/internal/getopt.h
- examples/include/pncompat/misc_defs.h
- examples/include/pncompat/misc_funcs.inc
- DESTINATION ${EXAMPLES_INSTALL_DIR}/messenger/pncompat)
-
# add relevant CTest support
find_program (MAVEN_EXECUTABLE mvn DOC "Location of the maven program")
if (JAVA_FOUND AND MAVEN_EXECUTABLE)
Modified: qpid/proton/trunk/examples/messenger/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/examples/messenger/c/CMakeLists.txt?rev=1506652&r1=1506651&r2=1506652&view=diff
==============================================================================
--- qpid/proton/trunk/examples/messenger/c/CMakeLists.txt (original)
+++ qpid/proton/trunk/examples/messenger/c/CMakeLists.txt Wed Jul 24 18:31:42 2013
@@ -17,12 +17,6 @@
# under the License.
#
-cmake_minimum_required (VERSION 2.6)
-
-find_path(PROTON_INCLUDE_DIR proton/types.h)
-find_library(PROTON_LIBRARY
- NAMES qpid-proton)
-
add_executable(recv recv.c)
add_executable(send send.c)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org