sanitize our way to find and load libunwind

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78df7eb..e22357c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,9 +105,9 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "18")
+set(SIMGRID_VERSION_MINOR "19")
 set(SIMGRID_VERSION_PATCH "0")
-# set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2017") # Year for copyright information
 
@@ -378,24 +378,17 @@ else()
 endif()
 
 include(FindLibunwind)
-if(HAVE_LIBUNWIND)
+if(LIBUNWIND_FOUND)
   if(NOT APPLE)
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind")
+    foreach(lib ${LIBUNWIND_LIBRARIES})
+      SET(SIMGRID_DEP "${SIMGRID_DEP} ${lib}")
+    endforeach()
+    unset(lib)
   else()
     # Apple forbids to link directly against its libunwind implementation
     # So let's comply and link against the System framework
     SET(SIMGRID_DEP "${SIMGRID_DEP} -lSystem")
   endif()
-  if("${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD")
-    set(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-ptrace")
-    # 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(SIMGRID_PROCESSOR_x86_64)
-      SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
-    else()
-      SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
-    endif()
-  endif()
 else()
   if(enable_model-checking)
     message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.")
@@ -772,6 +765,8 @@ if(NOT "${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_gather.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_gather.txt COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_allgatherv.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_allgatherv.txt COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_cluster ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_cluster COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_coll ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_coll COPYONLY)
 
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/description_file ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple/description_file COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/README ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple/README COPYONLY)