test for libunwind even if not building MC

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

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 50cdcf4..95ce460 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -8,14 +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()
-
 add_dependencies(simgrid maintainer_files)
 
 if(enable_model-checking)
@@ -28,12 +20,11 @@ endif()
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm")
-if (HAVE_BOOST_CONTEXT)
+if (HAVE_BOOST_CONTEXTS)
   set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
 endif()
 
-if(HAVE_PTHREAD AND ${CONTEXT_THREADS} AND NOT APPLE)
+if(HAVE_PTHREAD AND ${HAVE_THREAD_CONTEXTS} AND NOT APPLE)
   # Clang on recent Mac OS X is not happy about -pthread.
   SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
 endif()
@@ -61,8 +52,11 @@ 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} -ldl")
+  SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} -ldl")
+endif()
+
+if(HAVE_PAPI)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lpapi")
 endif()
 
 if(HAVE_GRAPHVIZ)
@@ -75,29 +69,8 @@ if(HAVE_GRAPHVIZ)
   endif()
 endif()
 
-if(HAVE_LIBSIGC++)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
-endif()
-
-if(HAVE_MC)
-  # The availability of libunwind was checked in CompleteInFiles.cmake
-  #   (that includes FindLibunwind.cmake), so simply load it now.
-
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
-
-  # Same for libdw
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
-  # This supposes that the host machine is either an AMD or a X86.
-  # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
-  if(PROCESSOR_x86_64)
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
-  else()
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
-  endif()
-endif()
-
-if(MMALLOC_WANT_OVERRIDE_LEGACY AND HAVE_GNU_LD)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
+if(HAVE_MC AND HAVE_GNU_LD)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl")
 endif()
 
 if(HAVE_NS3)
@@ -108,16 +81,6 @@ if(HAVE_POSIX_GETTIME)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif()
 
-if(HAVE_BACKTRACE_IN_LIBEXECINFO)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
-endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
-
-# Dependencies from USR
-###################################
-if(enable_ust)
-  set(SIMGRID_DEP "${SIMGRID_DEP} -llttng-ust")
-endif()
-
 # Compute the dependencies of SMPI
 ##################################
 if(enable_smpi AND APPLE)
@@ -126,16 +89,11 @@ 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)
+  add_dependencies(simgrid smpi_generated_headers_call_location_tracing)
+endif()
 if(enable_maintainer_mode AND PYTHON_EXE)
   add_dependencies(simgrid simcalls_generated_src)
 endif()