From 256187ac5f830a60ae79f441078c20c32be037b2 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 3 Dec 2010 00:23:35 +0000 Subject: [PATCH 1/1] install java from the simgrid-java, not make project git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8969 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/Distrib.cmake | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 2e277a8116..41b88fd142 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -96,10 +96,6 @@ foreach(file ${README_examples_files}) endforeach(file ${README_examples_files}) # bindings cruft -if(HAVE_JAVA) - install(FILES ${CMAKE_BINARY_DIR}/simgrid.jar - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/) -endif(HAVE_JAVA) if(HAVE_LUA) file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1") @@ -171,14 +167,6 @@ COMMAND ${CMAKE_COMMAND} -E echo "uninstall include ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) -if(HAVE_JAVA) - add_custom_command(TARGET uninstall - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/simgrid.jar - COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java ok" - WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/" - ) -endif(HAVE_JAVA) - if(HAVE_LUA) add_custom_command(TARGET uninstall COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok" -- 2.20.1