Author: chug
Date: Wed Aug 21 16:03:42 2013
New Revision: 1516194
URL: http://svn.apache.org/r1516194
Log:
PROTON-405: Windows install can't find jar files.
This patch adds a cmake option to skip building/installing jars.
Modified:
qpid/proton/trunk/CMakeLists.txt
Modified: qpid/proton/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1516194&r1=1516193&r2=1516194&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Wed Aug 21 16:03:42 2013
@@ -92,14 +92,18 @@ set (PROTON_JAR_DEPEND_DIR /usr/share/ja
# Pull in local cmake modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/tools/cmake/Modules/")
-find_package( Java )
-if (JAVA_FOUND)
- message(STATUS "Java version: ${Java_VERSION}. javac is at:
${Java_JAVAC_EXECUTABLE}")
- include(UseJava)
- include(ProtonUseJava)
-
- add_subdirectory(proton-j/proton-api)
- add_subdirectory(proton-j/proton)
+set (java_default ON)
+option(GEN_JAVA "Include java-related artifacts" ${java_default})
+if (GEN_JAVA)
+ find_package( Java )
+ if (JAVA_FOUND)
+ message(STATUS "Java version: ${Java_VERSION}. javac is at:
${Java_JAVAC_EXECUTABLE}")
+ include(UseJava)
+ include(ProtonUseJava)
+
+ add_subdirectory(proton-j/proton-api)
+ add_subdirectory(proton-j/proton)
+ endif()
endif()
add_subdirectory(proton-c)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
