You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ph...@apache.org on 2013/01/30 15:12:50 UTC
svn commit: r1440425 - in /qpid/proton/branches/jni-binding: CMakeLists.txt
TODO proton-c/CMakeLists.txt proton-c/TODO
Author: philharveyonline
Date: Wed Jan 30 14:12:50 2013
New Revision: 1440425
URL: http://svn.apache.org/viewvc?rev=1440425&view=rev
Log:
PROTON-194: modified cmake so that 'make install' still works, now that the top of the installed project is in proton/ rather than proton-c/
Added:
qpid/proton/branches/jni-binding/TODO
- copied, changed from r1440007, qpid/proton/branches/jni-binding/proton-c/TODO
Removed:
qpid/proton/branches/jni-binding/proton-c/TODO
Modified:
qpid/proton/branches/jni-binding/CMakeLists.txt
qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt
Modified: qpid/proton/branches/jni-binding/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/CMakeLists.txt?rev=1440425&r1=1440424&r2=1440425&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/CMakeLists.txt Wed Jan 30 14:12:50 2013
@@ -24,6 +24,16 @@ set (PN_VERSION_MAJOR 0)
set (PN_VERSION_MINOR 3)
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
+# Start of variables used during install
+set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
+set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Library object file directory")
+set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory")
+set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
+set (MAN_INSTALL_DIR share/man CACHE PATH "Manpage directory")
+
+set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton-${PN_VERSION})
+# End of variables used during install
+
# Location of proton-api jar created by the build; used by proton-jni and proton-j-impl
set (PROTON_API_TARGET_JAR ${CMAKE_BINARY_DIR}/proton-j/proton-api/proton-api-${PN_VERSION}.jar)
set (PROTON_JAR_DEPEND_DIR /usr/share/java/ CACHE PATH
@@ -46,3 +56,6 @@ endif()
add_subdirectory(proton-c)
+install (FILES LICENSE README TODO
+ DESTINATION ${PROTON_SHARE})
+
Copied: qpid/proton/branches/jni-binding/TODO (from r1440007, qpid/proton/branches/jni-binding/proton-c/TODO)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/TODO?p2=qpid/proton/branches/jni-binding/TODO&p1=qpid/proton/branches/jni-binding/proton-c/TODO&r1=1440007&r2=1440425&rev=1440425&view=diff
==============================================================================
(empty)
Modified: qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt?rev=1440425&r1=1440424&r2=1440425&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt Wed Jan 30 14:12:50 2013
@@ -47,14 +47,6 @@ if (NOT DEFINED LIB_SUFFIX)
endif()
endif()
-set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
-set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Library object file directory")
-set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory")
-set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
-set (MAN_INSTALL_DIR share/man CACHE PATH "Manpage directory")
-
-set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton-${PN_VERSION})
-
# Can't use ${CMAKE_VERSION) as it is not available in all versions of cmake 2.6
if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.0")
# OPTIONAL does not exist in install before 2.8 so always make docs and install
@@ -293,10 +285,6 @@ install (TARGETS proton proton-dump qpid
file(GLOB headers "include/proton/*.[hi]")
install (FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/proton)
-# Install documentation files
-install (FILES LICENSE README TODO
- DESTINATION ${PROTON_SHARE})
-
# Pkg config file
# Compatible variable names used in the pkg config files also for autoconf
get_filename_component (PREFIX ${CMAKE_INSTALL_PREFIX} ABSOLUTE)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org