From 1d0e982975cc5438362b3cde1b2fd5e628ed235f Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 19 Jan 2016 15:13:36 -0800 Subject: cmake: Drop Java support (IIRC java was used for the built-in scripts dialog, along with the linked python and perl libs) (bzr r14609) --- CMakeScripts/DefineDependsandFlags.cmake | 2 -- CMakeScripts/IncludeJava.cmake | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 CMakeScripts/IncludeJava.cmake (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index f29b98a1f..59c2cb063 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -400,8 +400,6 @@ if(WITH_IMAGE_MAGICK) endif() endif() -include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake) - set(ENABLE_NLS OFF) if(WITH_NLS) find_package(Gettext) diff --git a/CMakeScripts/IncludeJava.cmake b/CMakeScripts/IncludeJava.cmake deleted file mode 100644 index 09f2bbea6..000000000 --- a/CMakeScripts/IncludeJava.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# - include the src/javainc dir in the include path and the correct config path too - -include_directories(${CMAKE_SOURCE_DIR}/src/bind/javainc) - -if(WIN32) - include_directories(${CMAKE_SOURCE_DIR}/src/bind/javainc/win32) -endif(WIN32) -if(UNIX) - include_directories(${CMAKE_SOURCE_DIR}/src/bind/javainc/linux) -endif(UNIX) -if(SOLARIS) - include_directories(${CMAKE_SOURCE_DIR}/src/bind/javainc/solaris) -endif(SOLARIS) -- cgit v1.2.3