From: Martin Quinson Date: Mon, 19 Oct 2015 22:54:51 +0000 (+0200) Subject: Disable building static libs. X-Git-Tag: v3_13~1649 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c33130ef26223f8b6775db83287303742a5cfa05 Disable building static libs. It was not tested at all, so I guess that it does not work anyway. What's not tested does not exist and can be removed. If you need a feature, write a test for it. --- diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc index 629499ea1a..ca180b2746 100644 --- a/doc/doxygen/install.doc +++ b/doc/doxygen/install.doc @@ -201,10 +201,6 @@ accepts several options, as listed below. ensure the code quality, but as a user, that option will only bring you issues. - @li enable_lib_static (ON/OFF): enable this if you want to - compile the static library (but you should consider enjoying - this new century instead). - @li enable_maintainer_mode (ON/OFF): you only need to set this option if you modify very specific parts of SimGrid itself (the XML parsers and other related elements). Adds an extra diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index afa1426061..2f9177eff3 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -52,11 +52,6 @@ add_custom_target(simgrid_update_xml ALL install(TARGETS simgrid DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -if(enable_lib_static AND NOT WIN32) - install(TARGETS simgrid_static - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -endif() - if(enable_java) set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}") install(TARGETS simgrid-java diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index 178605892b..10bf2ea447 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -8,10 +8,6 @@ add_library(simgrid SHARED ${simgrid_sources}) set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version}) -if(enable_lib_static) - add_library(simgrid_static STATIC ${simgrid_sources}) -endif() - if(enable_ust) ADD_DEPENDENCIES(simgrid simgrid_ust) endif() @@ -125,14 +121,6 @@ endif() target_link_libraries(simgrid ${SIMGRID_DEP}) -# Pass dependencies to static libs -################################## -if(enable_lib_static) - target_link_libraries(simgrid_static ${SIMGRID_DEP}) - add_dependencies(simgrid_static maintainer_files) - set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid) -endif() - # Dependencies from maintainer mode ################################### if(enable_maintainer_mode AND PYTHON_EXE) diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake index e6fb3e9e6d..092f15df90 100644 --- a/tools/cmake/Option.cmake +++ b/tools/cmake/Option.cmake @@ -45,7 +45,6 @@ option(enable_print_message "Enable print message during config." off) mark_as_advanced(enable_print_message) option(enable_model-checking "Turn this on to experiment with our prototype of model-checker (hinders the simulation's performance even if turned off at runtime)" off) -option(enable_lib_static "" off) option(enable_lib_in_jar "Whether the native libraries are bundled in a Java jar file" on) option(enable_lto "Whether we should try to activate the LTO (link time optimisation)" on) option(enable_jedule "Jedule output of SimDAG." off) diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake index e7ad433b5c..32a1398862 100644 --- a/tools/cmake/PrintArgs.cmake +++ b/tools/cmake/PrintArgs.cmake @@ -115,7 +115,6 @@ message(" Compile MPI testsuite .......: ${enable_smpi_MPICH3_testsuite}" message(" Compile Smpi f77 ............: ${SMPI_FORTRAN}") message(" Compile Smpi f90 ............: ${SMPI_FORTRAN}") message(" Compile Boost.Context support: ${HAVE_BOOST_CONTEXT}") -message(" Compile Static ..............: ${enable_lib_static}") message("") message(" Maintainer mode .............: ${enable_maintainer_mode}") message(" Documentation................: ${enable_documentation}") diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 89e07a2507..0e50a6e048 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -54,7 +54,7 @@ cd $WORKSPACE/build ### Proceed with the tests cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \ - -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF \ + -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \ -Denable_memcheck_xml=ON $WORKSPACE @@ -74,7 +74,7 @@ fi make clean cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \ - -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF \ + -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF -Denable_mallocators=OFF \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_coverage=ON $WORKSPACE diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index acbb39c0da..6b9a8785f4 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -103,7 +103,7 @@ cmake -G"$GENERATOR"\ -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \ -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \ -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \ - -Denable_compile_warnings=ON -Denable_smpi=ON -Denable_lib_static=OFF \ + -Denable_compile_warnings=ON -Denable_smpi=ON \ -Denable_latency_bound_tracking=OFF -Denable_jedule=OFF \ -Denable_tracing=ON -Denable_java=ON make -j$NUMBER_OF_PROCESSORS VERBOSE=1