diff --git a/CMakeLists.txt b/CMakeLists.txt index 39d0bc0316..dcbfef3014 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,8 +142,8 @@ if(BUILD_JAVA) option(SKIP_GPG "Disable GPG sign" OFF) message(STATUS "Java disable gpg:sign: ${SKIP_GPG}") - option(COMPLETE_JAVA_PACKAGE "Build a Java multi OS Package" OFF) - message(STATUS "Java multiple os package: ${COMPLETE_JAVA_PACKAGE}") + option(UNIVERSAL_JAVA_PACKAGE "Build a Java multi OS Package" OFF) + message(STATUS "Java multiple os package: ${UNIVERSAL_JAVA_PACKAGE}") endif() # By default all dependencies are NOT built (i.e. BUILD_DEPS=OFF), diff --git a/cmake/java.cmake b/cmake/java.cmake index 472dacff05..5bda9f50f9 100644 --- a/cmake/java.cmake +++ b/cmake/java.cmake @@ -152,7 +152,7 @@ add_custom_target(java_native_package set(JAVA_PROJECT_PATH ${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}) file(MAKE_DIRECTORY ${JAVA_PROJECT_PATH}/${JAVA_PACKAGE_PATH}) -if(COMPLETE_JAVA_PACKAGE) +if(UNIVERSAL_JAVA_PACKAGE) configure_file( ${PROJECT_SOURCE_DIR}/ortools/java/pom-full.xml.in ${JAVA_PROJECT_PATH}/pom.xml diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index d48478b56b..7fa662fbf2 100644 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -438,7 +438,7 @@ endif $(TOUCH) $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT)$Stimestamp # ortools-java -ifeq ($(COMPLETE_JAVA_PACKAGE),1) +ifeq ($(UNIVERSAL_JAVA_PACKAGE),1) JAVA_ORTOOLS_POM=pom-full.xml.in else JAVA_ORTOOLS_POM=pom-local.xml.in