Test gtnets.

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

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index aa67593..03818c9 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -28,11 +28,13 @@ endif(disable_java)
 if(disable_gtnets)
        SET(HAVE_GTNETS 0)
 else(disable_gtnets)
+       SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
        set(GTNETS_LDFLAGS "-lgtnets -L${gtnets_path}/lib")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include -I${gtnets_path}/include/gtnets")
        exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/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(INCLUDES
@@ -145,8 +147,10 @@ if(with_context MATCHES "ucontext")
        else(mcsc MATCHES "yes")
                if(windows_context MATCHES "yes")
                        set(with_context "windows")
+                       message("with_context ucontext change to windows")
                else(windows_context MATCHES "yes")
                        set(with_context "pthread")
+                       message("with_context ucontext change to pthread")
                endif(windows_context MATCHES "yes")
        endif(mcsc MATCHES "yes")
 endif(with_context MATCHES "ucontext")
@@ -308,7 +312,7 @@ SET(SIZEOF_MAX ${var3})
 
 CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 #message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}")
-
+set(makecontext_CPPFLAGS_2 "")
 if(HAVE_MAKECONTEXT)
        set(makecontext_CPPFLAGS "-DTEST_makecontext")
        if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -316,15 +320,17 @@ if(HAVE_MAKECONTEXT)
                #message("SYSTEM OSX")
        endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-       exec_program("${CMAKE_C_COMPILER} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c ${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}" OUTPUT_VARIABLE COMPILE_makecontext_VAR)
-       exec_program("${PROJECT_DIRECTORY}/CPACK/prog_test/a.out" OUTPUT_VARIABLE COMPILE_makecontext_VAR)
-
+       try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
+               ${PROJECT_DIRECTORY}
+               ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_stacksetup.c
+               COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
+               )
        find_program(CAT_EXE NAMES cat)
 
-       exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/CPACK/prog_test/conftestval" OUTPUT_VARIABLE "makecontext_addr")
-       exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/CPACK/prog_test/conftestval" OUTPUT_VARIABLE "makecontext_size")
-       #message("${makecontext_addr}")
-       #message("${makecontext_size}")
+       exec_program("${SED_EXE}" ARGS "-e 's;,.*$;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_addr")
+       exec_program("${SED_EXE}" ARGS "-e 's;^.*,;;' ${PROJECT_DIRECTORY}/conftestval" OUTPUT_VARIABLE "makecontext_size")
+       message("${makecontext_addr}")
+       message("${makecontext_size}")
        set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
        set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
 
@@ -527,9 +533,9 @@ try_run(RUN_RESULT_VAR COMPILE_RESULT_VAR
        )
 
 if(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
-SET(need_getline "")
-else(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
 SET(need_getline "#define SIMGRID_NEED_GETLINE 1")
+else(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
+SET(need_getline "")
 endif(RUN_RESULT_VAR MATCHES "FAILED_TO_RUN")
 
 ### check for a working snprintf