Since cmake 2.6, else() and endif() don't need to repeat the condition.

[simgrid.git] / teshsuite / xbt / CMakeLists.txt

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index 0a26855..a4a7eb3 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -4,24 +4,32 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
 add_executable(log_large_test log_large_test.c)
 add_executable(parallel_log_crashtest parallel_log_crashtest.c)
-add_executable(mmalloc_test mmalloc_test.c)
+if(HAVE_MMAP)
+  add_executable(mmalloc_test mmalloc_test.c)
+endif()
 
 ### Add definitions for compile
 if(NOT WIN32)
   target_link_libraries(log_large_test gras m pthread )
   target_link_libraries(parallel_log_crashtest gras m pthread )
-  target_link_libraries(mmalloc_test gras m pthread )
-else(NOT WIN32)
+  if(HAVE_MMAP)
+    target_link_libraries(mmalloc_test gras m pthread )
+  endif()
+else()
   target_link_libraries(log_large_test gras)
   target_link_libraries(parallel_log_crashtest gras)
-  target_link_libraries(mmalloc_test gras)
-endif(NOT WIN32)
+  if(HAVE_MMAP)
+    target_link_libraries(mmalloc_test gras)
+  endif()
+endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/xbt.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_64.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_32.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -32,6 +40,7 @@ set(teshsuite_src
   ${teshsuite_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/log_large_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/parallel_log_crashtest.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mmalloc_test.c
   PARENT_SCOPE
   )
 set(bin_files