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/02/05 14:21:47 UTC
svn commit: r1442576 - in /qpid/proton/trunk: ./ cmake/Modules/ tools/
tools/cmake/ tools/cmake/Modules/
Author: mcpierce
Date: Tue Feb 5 13:21:46 2013
New Revision: 1442576
URL: http://svn.apache.org/viewvc?rev=1442576&view=rev
Log:
PROTON-219: Moves the cmake directory to tools/cmake
Updated the root CMakeLists.txt file to look there rather than off of
the root of the repo for the included modules.
Added:
qpid/proton/trunk/tools/
qpid/proton/trunk/tools/cmake/
qpid/proton/trunk/tools/cmake/Modules/
qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake
- copied, changed from r1442569, qpid/proton/trunk/cmake/Modules/FindJava.cmake
qpid/proton/trunk/tools/cmake/Modules/README
- copied, changed from r1442569, qpid/proton/trunk/cmake/Modules/README
qpid/proton/trunk/tools/cmake/Modules/UseJava.cmake
- copied, changed from r1442569, qpid/proton/trunk/cmake/Modules/UseJava.cmake
qpid/proton/trunk/tools/cmake/Modules/UseJavaClassFilelist.cmake
- copied, changed from r1442569, qpid/proton/trunk/cmake/Modules/UseJavaClassFilelist.cmake
qpid/proton/trunk/tools/cmake/Modules/UseJavaSymlinks.cmake
- copied, changed from r1442569, qpid/proton/trunk/cmake/Modules/UseJavaSymlinks.cmake
qpid/proton/trunk/tools/cmake/Modules/UseProtonJava.cmake
- copied, changed from r1442569, qpid/proton/trunk/cmake/Modules/UseProtonJava.cmake
Removed:
qpid/proton/trunk/cmake/Modules/FindJava.cmake
qpid/proton/trunk/cmake/Modules/README
qpid/proton/trunk/cmake/Modules/UseJava.cmake
qpid/proton/trunk/cmake/Modules/UseJavaClassFilelist.cmake
qpid/proton/trunk/cmake/Modules/UseJavaSymlinks.cmake
qpid/proton/trunk/cmake/Modules/UseProtonJava.cmake
Modified:
qpid/proton/trunk/CMakeLists.txt
Modified: qpid/proton/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1442576&r1=1442575&r2=1442576&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Tue Feb 5 13:21:46 2013
@@ -50,7 +50,7 @@ set (PROTON_JAR_DEPEND_DIR /usr/share/ja
"When locating compile-time dependencies, the build system searches this location in addition to the default ones provided by find_jar")
# Pull in local cmake modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tools/cmake/Modules/")
find_package( Java )
if (JAVA_FOUND)
Copied: qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake (from r1442569, qpid/proton/trunk/cmake/Modules/FindJava.cmake)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake?p2=qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake&p1=qpid/proton/trunk/cmake/Modules/FindJava.cmake&r1=1442569&r2=1442576&rev=1442576&view=diff
==============================================================================
(empty)
Copied: qpid/proton/trunk/tools/cmake/Modules/README (from r1442569, qpid/proton/trunk/cmake/Modules/README)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/README?p2=qpid/proton/trunk/tools/cmake/Modules/README&p1=qpid/proton/trunk/cmake/Modules/README&r1=1442569&r2=1442576&rev=1442576&view=diff
==============================================================================
(empty)
Copied: qpid/proton/trunk/tools/cmake/Modules/UseJava.cmake (from r1442569, qpid/proton/trunk/cmake/Modules/UseJava.cmake)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/UseJava.cmake?p2=qpid/proton/trunk/tools/cmake/Modules/UseJava.cmake&p1=qpid/proton/trunk/cmake/Modules/UseJava.cmake&r1=1442569&r2=1442576&rev=1442576&view=diff
==============================================================================
(empty)
Copied: qpid/proton/trunk/tools/cmake/Modules/UseJavaClassFilelist.cmake (from r1442569, qpid/proton/trunk/cmake/Modules/UseJavaClassFilelist.cmake)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/UseJavaClassFilelist.cmake?p2=qpid/proton/trunk/tools/cmake/Modules/UseJavaClassFilelist.cmake&p1=qpid/proton/trunk/cmake/Modules/UseJavaClassFilelist.cmake&r1=1442569&r2=1442576&rev=1442576&view=diff
==============================================================================
(empty)
Copied: qpid/proton/trunk/tools/cmake/Modules/UseJavaSymlinks.cmake (from r1442569, qpid/proton/trunk/cmake/Modules/UseJavaSymlinks.cmake)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/UseJavaSymlinks.cmake?p2=qpid/proton/trunk/tools/cmake/Modules/UseJavaSymlinks.cmake&p1=qpid/proton/trunk/cmake/Modules/UseJavaSymlinks.cmake&r1=1442569&r2=1442576&rev=1442576&view=diff
==============================================================================
(empty)
Copied: qpid/proton/trunk/tools/cmake/Modules/UseProtonJava.cmake (from r1442569, qpid/proton/trunk/cmake/Modules/UseProtonJava.cmake)
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/UseProtonJava.cmake?p2=qpid/proton/trunk/tools/cmake/Modules/UseProtonJava.cmake&p1=qpid/proton/trunk/cmake/Modules/UseProtonJava.cmake&r1=1442569&r2=1442576&rev=1442576&view=diff
==============================================================================
(empty)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org