From 18b038a13c3502d5787a3c8e6bc02f81aecd4781 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 1 Sep 2015 01:58:50 +0200 Subject: [PATCH 1/1] [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!! --- CMakeLists.txt | 4 ++++ tools/cmake/MakeLib.cmake | 4 ---- tools/cmake/MakeLibWin.cmake | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) 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") -- 2.20.1