valgrind version checking rule did not match 3.10.0

[simgrid.git] / tools / cmake / MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 2fb2f46..b21a0ce 100644 (file)
--- 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()
@@ -61,7 +57,7 @@ if(HAVE_LUA)
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test
     )
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -l${LIB_LUA_NAME}")
+  SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} -ldl")
 endif()
 
 if(HAVE_GRAPHVIZ)
@@ -76,6 +72,8 @@ endif()
 
 if(HAVE_LIBSIGC++)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
+  add_definitions(-DLIBSIGC)
+  set(SIMGRID_HAVE_LIBSIG 1)
 endif()
 
 if(HAVE_MC)
@@ -125,14 +123,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)