4138 magnus.blaudd@stripped 2012-12-06
ndb
- Make FindJava look for and require the JDK not just JRE
modified:
storage/ndb/CMakeLists.txt
storage/ndb/cmake/ndb_require_variable.cmake
4137 magnus.blaudd@stripped 2012-12-04
ndb
- deduce JAVA_HOME from JAVA_COMPILE(path to javac) instead of JAVA_RUNTIME
since the latter may be part of jre and not jdk
- "symlink hell"
modified:
storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt 2012-12-04 17:44:35 +0000
+++ b/storage/ndb/CMakeLists.txt 2012-12-06 12:33:23 +0000
@@ -238,7 +238,7 @@ OPTION(WITH_NDB_JAVA
"Include NDB Cluster Java components" ${WITH_NDB_JAVA_DEFAULT})
IF(WITH_NDB_JAVA)
# Check for Java and JDK needed by ndbjtie and clusterj
- FIND_PACKAGE(Java 1.6 REQUIRED)
+ FIND_PACKAGE(Java 1.6 REQUIRED COMPONENTS Development)
MESSAGE(STATUS "Java_VERSION: ${Java_VERSION}")
MESSAGE(STATUS "Java_VERSION_STRING: ${Java_VERSION_STRING}")
MESSAGE(STATUS "JAVA_RUNTIME: ${JAVA_RUNTIME}")
=== modified file 'storage/ndb/cmake/ndb_require_variable.cmake'
--- a/storage/ndb/cmake/ndb_require_variable.cmake 2012-12-03 13:24:40 +0000
+++ b/storage/ndb/cmake/ndb_require_variable.cmake 2012-12-06 12:33:23 +0000
@@ -20,7 +20,7 @@
#
MACRO(NDB_REQUIRE_VARIABLE variable_name)
#MESSAGE(STATUS "Checking variable ${variable_name} required by NDB")
- IF(NOT DEFINED "${variable_name}")
+ IF(NOT "${variable_name}")
MESSAGE(FATAL_ERROR "The variable ${variable_name} is required "
"to build NDB")
ENDIF()
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4137 to 4138) | magnus.blaudd | 6 Dec |
