X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9cc5dac9b02b2bf4f7a01e27642b0e6060877dd1..41dc0d03d65ec6d89569d47d3a335d84b0ba927e:/buildtools/Cmake/MakeLib.cmake diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index 45b347dd60..6d373a1c5b 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -47,7 +47,7 @@ endif(enable_supernovae) # Compute the dependencies of GRAS ################################## -set(GRAS_DEP "-lm -lpthread") +set(GRAS_DEP "-lm -pthread") if(HAVE_POSIX_GETTIME) SET(GRAS_DEP "${GRAS_DEP} -lrt") @@ -70,7 +70,7 @@ set(SIMGRID_DEP "-lm -lpcre") if(pthread) if(${CONTEXT_THREADS}) - SET(SIMGRID_DEP "${SIMGRID_DEP} -lpthread") + SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread") endif(${CONTEXT_THREADS}) endif(pthread) @@ -120,7 +120,7 @@ if(HAVE_NS3) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_NS3_3_10") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_NS3_3_10") else(${NS3_VERSION} EQUAL 310) - SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point") + SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3-core -lns3-csma -lns3-point-to-point -lns3-internet -lns3-applications") endif(${NS3_VERSION} EQUAL 310) endif(HAVE_NS3) @@ -150,4 +150,10 @@ if(enable_lib_static) target_link_libraries(smpi_static simgrid ${SMPI_LDEP}) set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi) endif(enable_smpi) -endif(enable_lib_static) \ No newline at end of file +endif(enable_lib_static) + +# Dependencies from maintainer mode +################################### +if(enable_maintainer_mode AND YACC_EXE AND LEX_EXE) + add_dependencies(simgrid automaton_generated_src) +endif(enable_maintainer_mode AND YACC_EXE AND LEX_EXE) \ No newline at end of file