From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 31 Aug 2015 23:58:50 +0000 (+0200)
Subject: [Cmake] small cleanup
X-Git-Tag: v3_12~293
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/18b038a13c3502d5787a3c8e6bc02f81aecd4781

[Cmake] small cleanup

Why is the directive loading Java cruft hidden in the file building the lib?
And while is that file dupplicated and only partially adapted to windows??
Aaah, my eyes! it burns!!
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d54d92a61..6e628d32af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,6 +256,10 @@ else()
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLibWin.cmake)
 endif()
 
+if(enable_java)
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake)
+endif()
+
 ### Make Exes
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
 
diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index a240c3b59e..6c018d6277 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -16,10 +16,6 @@ if(enable_ust)
   ADD_DEPENDENCIES(simgrid simgrid_ust)
 endif()
 
-if(enable_java)
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake)
-endif()
-
 add_dependencies(simgrid maintainer_files)
 
 if(enable_model-checking)
diff --git a/tools/cmake/MakeLibWin.cmake b/tools/cmake/MakeLibWin.cmake
index 85a93ccefb..d11222fade 100644
--- a/tools/cmake/MakeLibWin.cmake
+++ b/tools/cmake/MakeLibWin.cmake
@@ -1,10 +1,6 @@
 ### Make Libs
 #>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
 
-if(enable_java)
-  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeJava.cmake)
-endif()
-
 add_library(simgrid SHARED ${simgrid_sources})
 
 set_target_properties(simgrid  PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" LINK_FLAGS "-shared" VERSION ${libsimgrid_version} PREFIX "lib" SUFFIX ".dll" IMPORT_PREFIX "lib" IMPORT_SUFFIX ".dll")