Delete double negation for option.

[simgrid.git] / buildtools / Cmake / src / CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 95dd392..a64286b 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -53,9 +53,9 @@ CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
-SET(HAVE_RUBY_H 0)
+SET(HAVE_RUBY 0)
 set(libruby "ruby1.8")
-if(NOT disable_ruby)
+if(enable_ruby)
        include(FindRuby)
        set(OKITOKI no)
        foreach(path ${RUBY_INCLUDE_PATH})
@@ -79,19 +79,19 @@ if(NOT disable_ruby)
                
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${RUBY_INCLUDE_PATH} -fPIC ")
                ADD_DEFINITIONS("-I${PROJECT_DIRECTORY}/src/bindings/ruby -I${PROJECT_DIRECTORY}/src/simix")
-               SET(HAVE_RUBY_H 1)
+               SET(HAVE_RUBY 1)
        endif(RUBY_INCLUDE_PATH)
-endif(NOT disable_ruby)
+endif(enable_ruby)
 
-if(tracing)
+if(enable_tracing)
        SET(HAVE_TRACING 1)
-endif(tracing)
+endif(enable_tracing)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT JAVA
-if(disable_java)
+if(NOT enable_java)
        SET(HAVE_JAVA 0)
-else(disable_java)
+else(NOT enable_java)
        include(FindJava)
        include(FindJNI)
        if(JAVA_INCLUDE_PATH)
@@ -106,26 +106,24 @@ else(disable_java)
        else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
                SET(HAVE_JAVA 0)
        endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-endif(disable_java)
+endif(NOT enable_java)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT GTNETS
-if(disable_gtnets)
+if(NOT enable_gtnets)
        SET(HAVE_GTNETS 0)
-else(disable_gtnets)
-       SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
+else(NOT enable_gtnets)
        set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
        exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR) 
        if(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 0)
-               message("GTnetS doesn't works : set -Ddisable_gtnets=on")
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)
                SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")
        endif(COMPILE_GTNETS_VAR)
-endif(disable_gtnets)
+endif(NOT enable_gtnets)
 
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
@@ -254,7 +252,7 @@ endif(NOT with_context_ok)
 
 set(HAVE_LUA 0)
 
-if(NOT disable_lua)
+if(enable_lua)
        find_path(HAVE_LUA5_1_LUALIB_H
        NAMES lualib.h 
        PATHS "/sw/include/" "/usr/include/lua5.1/"
@@ -289,21 +287,24 @@ if(NOT disable_lua)
 
        if(LUA_LIB_PATH_1)
                set(liblua lua5.1)
+               set(lua_lib_path_to_use ${LUA_LIB_PATH_1})
        endif(LUA_LIB_PATH_1)
 
        if(LUA_LIB_PATH_2)
                set(liblua lua-5.1)
+               set(lua_lib_path_to_use ${LUA_LIB_PATH_2})
        endif(LUA_LIB_PATH_2)
 
        if(LUA_LIB_PATH_3)
                set(liblua lua.5.1.1)
+               set(lua_lib_path_to_use ${LUA_LIB_PATH_3})
        endif(LUA_LIB_PATH_3)
 
        if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
                set(HAVE_LUA 0)
        endif(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)
 
-endif(NOT disable_lua)
+endif(enable_lua)
 
 ###############
 ## SVN version check
@@ -650,6 +651,8 @@ SET( CMAKEDEFINE "#cmakedefine" )
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE)
 configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" "${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${PROJECT_DIRECTORY}/include/simgrid_config.h)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_tracing_config.h.in" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_tracing_config.h.in" "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 if(NOT prefix)
        set(prefix /usr/local)