Merge branch 'wifi_clean' into 'master'

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

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index b0b8837cf0230182a8b823cfb04dc9a05d28a5d0..551c48eb5eb1c2addb6e82761ce2e8c775e0be5c 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -35,6 +35,12 @@ else()
   set(EXTRA_DIST ${EXTRA_DIST} ${STHREAD_SRC})
 endif()
 
+if(HAVE_MMALLOC)
+  add_library(sgmalloc SHARED ${SGMALLOC_SRC})
+  set_property(TARGET sgmalloc
+                APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
+endif()
+
 if(enable_model-checking)
   add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
   target_link_libraries(simgrid-mc simgrid)
@@ -133,7 +139,7 @@ if(enable_smpi)
        if ("${CMAKE_SYSTEM_VERSION}" STRGREATER_EQUAL "12")
             set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath")
         endif()
-        if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\.1")
+        if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\\.1")
             set(SIMGRID_DEP "${SIMGRID_DEP} -lomp")
         endif()
       endif()