Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
reduce the shotgun design pattern in the detection of NS3
[simgrid.git] / CMakeLists.txt
index 78df7eb..e294a4e 100644 (file)
@@ -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
 
@@ -234,6 +234,7 @@ if(enable_ns3)
   include(FindNS3)
   if (SIMGRID_HAVE_NS3)
     set(SIMGRID_HAVE_NS3 1)
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-core${NS3_SUFFIX} -lns${NS3_VERSION}-csma${NS3_SUFFIX} -lns${NS3_VERSION}-point-to-point${NS3_SUFFIX} -lns${NS3_VERSION}-internet${NS3_SUFFIX} -lns${NS3_VERSION}-network${NS3_SUFFIX} -lns${NS3_VERSION}-applications${NS3_SUFFIX}")
   else()
     message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
   endif()
@@ -379,23 +380,7 @@ endif()
 
 include(FindLibunwind)
 if(HAVE_LIBUNWIND)
-  if(NOT APPLE)
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind")
-  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()
+  SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES}")
 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.")
@@ -417,6 +402,8 @@ else()
   SET(SIMGRID_HAVE_MC 0)  
   set(HAVE_MMALLOC 0)
 endif()
+mark_as_advanced(PATH_LIBDW_H)
+mark_as_advanced(PATH_LIBDW_LIB)
 
 if (enable_model-checking AND enable_ns3)
   message(FATAL_ERROR "Cannot activate both model-checking and NS3 bindings: NS3 pull too much dependencies for the MC to work")
@@ -772,6 +759,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)