Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da1fce5..51bd4bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,9 +226,11 @@ include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(CheckSymbolExists)
 
+set(HAVE_GRAPHVIZ 0)
 include(FindGraphviz)
 include(FindLibSigc++)
 
+set(HAVE_LUA 0)
 if(enable_lua)
   include(FindLuaSimgrid)
 endif()
@@ -606,10 +608,7 @@ if(WIN32)
   try_compile(HAVE_UCONTEXT
     ${CMAKE_BINARY_DIR}
     ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c
-    COMPILE_DEFINITIONS _XBT_WIN32
-    INCLUDE_DIRECTORIES
-      ${CMAKE_HOME_DIRECTORY}/src/include
-      ${CMAKE_HOME_DIRECTORY}/src/xbt
+    COMPILE_DEFINITIONS -D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/src/include -I${CMAKE_HOME_DIRECTORY}/src/xbt
   )
 else()
   # We always provide our own implementation of ucontext on Windows.
@@ -1043,7 +1042,10 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
 ### Define subdirectories
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeExe.cmake)
+foreach(cmakefile ${CMAKEFILES_TXT})
+  string(REPLACE "/CMakeLists.txt" "" repository ${cmakefile})
+  add_subdirectory("${CMAKE_HOME_DIRECTORY}/${repository}")
+endforeach()
 
 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Distrib.cmake)