remove dupplicated dependency that is also given out of the if branches

[simgrid.git] / buildtools / Cmake / MakeJava.cmake

diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
index 58682d8..34f99e7 100644 (file)
--- a/buildtools/Cmake/MakeJava.cmake
+++ b/buildtools/Cmake/MakeJava.cmake
@@ -9,7 +9,7 @@ set_target_properties(simgrid-java PROPERTIES VERSION ${libsimgrid-java_version}
 if (CMAKE_VERSION VERSION_LESS "2.8.8")
   include_directories(${JNI_INCLUDE_DIRS})
 
-  message(WARNING "[Java] Try to workaround missing feature in older CMake.  You should better update CMake to version 2.8.8 or above.")
+  message("[Java] Try to workaround missing feature in older CMake. You should better update CMake to version 2.8.8 or above.")
   get_directory_property(CHECK_INCLUDES INCLUDE_DIRECTORIES)
 else()
   get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
@@ -20,7 +20,6 @@ else()
     set_target_properties(simgrid-java PROPERTIES
       INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
   endif()
-  add_dependencies(simgrid-java simgrid)
 
   get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
 endif()
@@ -34,7 +33,7 @@ if(WIN32)
                 OUTPUT_VARIABLE IS_32_BITS_JVM)
   STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION )
   if(${POSITION} GREATER -1)
-    message(FATAL_ERROR "Java JVM needs to be 32 bits to be able to run with Simgrid on Windows for now")
+    message("POTENTIAL ERROR: Java JVM needs to be 32 bits to be able to run with Simgrid on Windows for now")
   endif()
 
   set_target_properties(simgrid-java PROPERTIES
@@ -125,10 +124,12 @@ if(enable_maintainer_mode)
 
   swig_add_module(surf-java java ${JSURF_SWIG_SRC} ${JSURF_JAVA_C_SRC})
 
-  add_custom_command(TARGET surf-java POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/src/bindings/java/surfJAVA_wrap.cxx" "${CMAKE_HOME_DIRECTORY}/src/bindings/java/surfJAVA_wrap.cxx"
-    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/src/bindings/java/surfJAVA_wrap.h" "${CMAKE_HOME_DIRECTORY}/src/bindings/java/surfJAVA_wrap.h"
-  )
+  if(NOT "${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+    add_custom_command(TARGET surf-java POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx" "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx"
+      COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h" "${CMAKE_HOME_DIRECTORY}/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h"
+    )
+  endif()
 
   swig_link_libraries(surf-java simgrid)
 else()