accept lua option

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7064 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt
index 658289b..ab42b2b 100644 (file)
--- a/buildtools/CPACK/src/CMakeDefinePackages.txt
+++ b/buildtools/CPACK/src/CMakeDefinePackages.txt
@@ -154,8 +154,10 @@ set(SMPI_SRC
        ${PROJECT_DIRECTORY}/src/smpi/smpi_bench.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_global.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_mpi.c
-       ${PROJECT_DIRECTORY}/src/smpi/smpi_sender.c
-       ${PROJECT_DIRECTORY}/src/smpi/smpi_receiver.c
+       #${PROJECT_DIRECTORY}/src/smpi/smpi_sender.c
+       #${PROJECT_DIRECTORY}/src/smpi/smpi_receiver.c
+       ${PROJECT_DIRECTORY}/src/smpi/smpi_comm.c
+       ${PROJECT_DIRECTORY}/src/smpi/smpi_group.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_util.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_coll.c
        ${PROJECT_DIRECTORY}/src/smpi/smpi_mpi_dt.c

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 051be86..eac42f1 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -6,7 +6,7 @@ add_library(simgrid SHARED ${simgrid_sources})
 add_library(gras SHARED ${gras_sources})
 add_library(smpi SHARED ${SMPI_SRC})
 
-set(GRAS_DEP "")
+set(GRAS_DEP "pthread")
 set(SIMGRID_DEP "")
 
 if(pthread)
@@ -14,15 +14,14 @@ if(pthread)
                SET(SIMGRID_DEP pthread)
                SET(ESPACE " ")
        endif(with_context MATCHES pthread)
-
+       
        if(with_context MATCHES windows)
-       elseif(with_context MATCHES windows)
-               SET(GRAS_DEP pthread)   
+               SET(GRAS_DEP "")
        endif(with_context MATCHES windows)
 endif(pthread)
 
 if(HAVE_LUA)
-       SET(SIMGRID_DEP "${SIMGRID_DEP}${ESPACE}dl lua5.1")
+       SET(SIMGRID_DEP "${SIMGRID_DEP}${ESPACE}-ldl -llua5.1")
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)
@@ -36,7 +35,7 @@ message("GRAS_DEP \"${GRAS_DEP}\"")
 set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
 add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
 target_link_libraries(simgrid ${SIMGRID_DEP} ${SIMGRID_DEP_GTNETS}-fprofile-arcs)
-target_link_libraries(gras ${GRAS_DEP} pthread -fprofile-arcs)
+target_link_libraries(gras ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi -fprofile-arcs)
 
 ### Make EXEs
@@ -103,7 +102,7 @@ if(NOT init)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
+       #add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
        if(HAVE_JAVA)
                message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")

diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 6078d11..87e415c 100644 (file)
--- a/buildtools/CPACK/src/CMakeOption.txt
+++ b/buildtools/CPACK/src/CMakeOption.txt
@@ -2,7 +2,6 @@
 ### ex: cmake -Ddisable_java=ON -Ddisable_gtnets=ON ./
 
 #SET(disable_java ON) #default value
-#SET(disable_threads ON)
 #SET(disable_gtnets ON)
 #SET(disable_context ON)
 #SET(disable_lua ON)
@@ -10,9 +9,9 @@
 #SET(MAINTAINER_MODE OFF)
 
 option(init "Set ON for make _*.c with gras_stub_generator" OFF)
+option(MAINTAINER_MODE "Permit to make flex and flexml files." OFF)
 option(disable_java "This variable set the java context." ON)
 option(disable_gtnets "This variable set the gtnets context." ON)
-option(disable_threads "This variable set the thread context." ON)
 option(disable_context "This variable set the context." ON)
 option(disable_lua "This variable set lua use." ON)
-option(MAINTAINER_MODE "Permit to make flex and flexml files." OFF)
+

diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt
index 4495d9e..d34db93 100644 (file)
--- a/buildtools/CPACK/src/CMakePrintArgs.txt
+++ b/buildtools/CPACK/src/CMakePrintArgs.txt
@@ -1,9 +1,8 @@
 message("\n________ARGS_________")
-
+message("init ${init}")
+message("MAINTAINER_MODE ${MAINTAINER_MODE}")
 message("disable_java ${disable_java}")
-
-message("disable_threads ${disable_threads}")
-
+message("disable_lua ${disable_lua}")
 message("disable_gtnets ${disable_gtnets}")
 if(disable_gtnets)
        set(gtnets_path "none" CACHE TYPE INTERNAL FORCE)       
@@ -16,10 +15,5 @@ if(disable_context)
 endif(disable_context)
 message("  -> with_context \"${with_context}\"")
 
-message("disable_lua ${disable_lua}")
-
-message("init ${init}")
-message("MAINTAINER_MODE ${MAINTAINER_MODE}")
-
 message("_______END_ARGS_______")
 #--------------------------------------------------------------------------------------------------