summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
70f837b)
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!!
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLibWin.cmake)
endif()
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)
### Make Exes
include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
ADD_DEPENDENCIES(simgrid simgrid_ust)
endif()
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)
add_dependencies(simgrid maintainer_files)
if(enable_model-checking)
### Make Libs
#>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32
### 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")
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")