Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/data-formatting-installer-fix into
lp:zorba/data-formatting-module.
Commit message:
Fix for Ubuntu Installer.
Requested reviews:
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-installer-fix/+merge/165914
Fix for Ubuntu Installer.
--
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-installer-fix/+merge/165914
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-06-14 12:40:01 +
+++ CMakeLists.txt 2013-05-27 16:30:48 +
@@ -19,14 +19,15 @@
PROJECT (zorba_data-formatting_module)
FIND_PACKAGE (zorba_util-jvm_module QUIET)
+INCLUDE (${zorba_util-jvm_module_USE_FILE})
IF (zorba_util-jvm_module_FOUND)
- INCLUDE (${zorba_util-jvm_module_USE_FILE})
-
- ZORBA_FIND_JNI()
- FIND_PACKAGE(Java)
FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
INCLUDE (${Zorba_USE_FILE})
+
+ SET_CMAKE_MODULE_PATH ()
+ FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java)
IF (JNI_FOUND)
INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
@@ -34,8 +35,6 @@
ENABLE_TESTING ()
INCLUDE (CTest)
-SET_CMAKE_MODULE_PATH ()
-
FIND_PACKAGE (Zorba REQUIRED HINTS ${ZORBA_BUILD_DIR})
INCLUDE (${Zorba_USE_FILE})
=== added file 'cmake_modules/FindJNI.cmake'
--- cmake_modules/FindJNI.cmake 1970-01-01 00:00:00 +
+++ cmake_modules/FindJNI.cmake 2013-05-27 16:30:48 +
@@ -0,0 +1,292 @@
+# - Find JNI java libraries.
+# This module finds if Java is installed and determines where the
+# include files and libraries are. It also determines what the name of
+# the library is. This code sets the following variables:
+#
+# JNI_INCLUDE_DIRS = the include dirs to use
+# JNI_LIBRARIES = the libraries to use
+# JNI_FOUND = TRUE if JNI headers and libraries were found.
+# JAVA_AWT_LIBRARY = the path to the jawt library
+# JAVA_JVM_LIBRARY = the path to the jvm library
+# JAVA_INCLUDE_PATH = the include path to jni.h
+# JAVA_INCLUDE_PATH2= the include path to jni_md.h
+# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+#
+
+#=
+# Copyright 2001-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+MACRO(java_append_library_directories _var)
+# Determine java arch-specific library subdir
+# Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+# 1.6.0_18 + icedtea patches. However, it would be much better to base the
+# guess on the first part of the GNU config.guess platform triplet.
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch amd64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^i.86$)
+SET(_java_libarch i386)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^alpha)
+SET(_java_libarch alpha)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^arm)
+# Subdir is arm for both big-endian (arm) and little-endian (armel).
+SET(_java_libarch arm)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^mips)
+# mips* machines are bi-endian mostly so processor does not tell
+# endianess of the underlying system.
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} mips mipsel mipseb)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc)64)
+SET(_java_libarch ppc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(powerpc|ppc))
+SET(_java_libarch ppc)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sparc)
+# Both flavours can run on the same processor
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} sparc sparcv9)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^(parisc|hppa))
+SET(_java_libarch parisc parisc64)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^s390)
+# s390 binaries can run on s390x machines
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR} s390 s390x)
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES ^sh)
+SET(_java_libarch sh)
+ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR})
+ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+
+# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
+# system is non-Linux (where the code above has not been well tested)
+IF(NOT _java_libarch OR NOT
