16 lines
743 B
Diff
16 lines
743 B
Diff
diff -up mp-3.1.0/solvers/jacop/CMakeLists.txt.jni mp-3.1.0/solvers/jacop/CMakeLists.txt
|
|
--- mp-3.1.0/solvers/jacop/CMakeLists.txt.jni 2016-05-05 12:39:14.000000000 +0200
|
|
+++ mp-3.1.0/solvers/jacop/CMakeLists.txt 2016-05-05 12:39:21.000000000 +0200
|
|
@@ -5,11 +5,6 @@ if (build_jacop)
|
|
file(GLOB JACOP_JAR_PATH ${PROJECT_SOURCE_DIR}/thirdparty/jacop/jacop-*.jar)
|
|
get_filename_component(jar ${JACOP_JAR_PATH} NAME)
|
|
set(JACOP_JAR ${jar} CACHE STRING "JaCoP JAR file name.")
|
|
- if (CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
- # Set CMAKE_SYSTEM_PROCESSOR to make sure FindJNI finds the correct
|
|
- # AWT and JVM libraries.
|
|
- set(CMAKE_SYSTEM_PROCESSOR i586)
|
|
- endif ()
|
|
find_package(JNI)
|
|
find_package(Java)
|
|
if (JNI_FOUND AND JAVA_FOUND)
|