Chris Hillery has proposed merging lp:~zorba-coders/zorba/util-jvm-installable
into lp:zorba/util-jvm-module.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-installable/+merge/108548
--
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-installable/+merge/108548
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/util-jvm-installable into lp:zorba/util-jvm-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-05-18 10:36:07 +0000
+++ CMakeLists.txt 2012-06-04 11:46:30 +0000
@@ -40,11 +40,16 @@
# Export this include directory by setting ZORBA_PROJECT_INCLUDE_DIRS
SET (ZORBA_PROJECT_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
INCLUDE_DIRECTORIES ("${ZORBA_PROJECT_INCLUDE_DIRS}")
+ INSTALL (FILES include/JavaVMSingleton.h DESTINATION include)
# Set up a "use file" for other modules to import
SET (ZORBA_PROJECT_USE_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/config/UtilJavaUse.cmake")
ADD_SUBDIRECTORY ("src")
+
+ # Set up configuration for install
+ ADD_SUBDIRECTORY ("config")
+
DONE_DECLARING_ZORBA_URIS ()
ELSE (JNI_FOUND)
=== added file 'config/CMakeLists.txt'
--- config/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ config/CMakeLists.txt 2012-06-04 11:46:30 +0000
@@ -0,0 +1,37 @@
+# Copyright 2006-2012 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# We need to be able to install util-jvm and then build module projects
+# against that. The "auto-config" approach Zorba provides does not
+# support this, so we roll our own here. This should probably be
+# re-thought in the future.
+
+SET (UTILJVM_CMAKE_DIR "share/cmake/zorba_util-jvm_module")
+
+# First, install the Use file. Doesn't need to be configured since it
+# just contains a macro.
+INSTALL (FILES UtilJavaUse.cmake DESTINATION "${UTILJVM_CMAKE_DIR}")
+
+# Anyway, we set all the same variables to what they should be in the
+# install image, and re-config Zorba's ExternalModuleConfig.cmake.in.
+SET (ZORBA_PROJECT_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+SET (ZORBA_PROJECT_USE_FILE "${CMAKE_INSTALL_PREFIX}/${UTILJVM_CMAKE_DIR}/UtilJavaUse.cmake")
+GET_TARGET_PROPERTY(_libpath util-jvm LOCATION)
+GET_FILENAME_COMPONENT(_libname "${_libpath}" NAME)
+SET (ZORBA_PROJECT_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/${_libname}")
+
+CONFIGURE_FILE("${Zorba_EXTERNALMODULECONFIG_FILE}"
+ "${PROJECT_BINARY_DIR}/install/${PROJECT_NAME}Config.cmake" @ONLY)
+INSTALL(FILES "${PROJECT_BINARY_DIR}/install/${PROJECT_NAME}Config.cmake"
+ DESTINATION "${UTILJVM_CMAKE_DIR}")
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
