From 8f697287036901b824d792a1cda02935f25f4320 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Mon, 18 Apr 2016 11:28:23 +0100 Subject: [PATCH] [CMake] Change default install location for ``com.microsoft.z3.jar``. It seems ``.jar`` files are typically installed into ``/usr/share/java``. --- contrib/cmake/src/api/java/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/cmake/src/api/java/CMakeLists.txt b/contrib/cmake/src/api/java/CMakeLists.txt index e41fa5ed0..b0ac2bedb 100644 --- a/contrib/cmake/src/api/java/CMakeLists.txt +++ b/contrib/cmake/src/api/java/CMakeLists.txt @@ -214,14 +214,15 @@ add_jar(z3JavaJar option(INSTALL_JAVA_BINDINGS "Install Java bindings when invoking install target" ON) if (INSTALL_JAVA_BINDINGS) # Provide cache variables for the install locations that the user can change. - # FIXME: I don't think these defaults install locations conform to the Debian - # packaging guidelines or any packaging guidelines for that matter... + # This defaults to ``/usr/local/java`` which seems to be the location for ``.jar`` + # files on Linux distributions set(Z3_JAVA_JAR_INSTALLDIR - "${CMAKE_INSTALL_LIBDIR}" + "${CMAKE_INSTALL_DATAROOTDIR}/java" CACHE PATH "Directory to install Z3 Java jar file relative to install prefix" ) + # FIXME: I don't think this the right installation location set(Z3_JAVA_JNI_LIB_INSTALLDIR "${CMAKE_INSTALL_LIBDIR}" CACHE