From 58944921dc52367edb9be46cded4b6d4f59ffd52 Mon Sep 17 00:00:00 2001 From: navarrop Date: Fri, 12 Feb 2010 09:07:11 +0000 Subject: [PATCH] Pass with all flags. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7086 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- .../CPACK/prog_test/prog_AC_CHECK_MCSC.c | 5 + buildtools/CPACK/prog_test/prog_GRAS_ARCH.c | 3 +- .../prog_GRAS_CHECK_STRUCT_COMPACTION.c | 4 +- buildtools/CPACK/prog_test/prog_max_size.c | 3 +- buildtools/CPACK/prog_test/prog_stackgrowth.c | 1 + buildtools/CPACK/prog_test/prog_stacksetup.c | 1 + .../CPACK/simgrid_CMakeList/CMakeLists.txt | 9 +- .../examples/smpi/CMakeLists.txt | 2 +- buildtools/CPACK/src/CMakeCompleteInFiles.txt | 120 ++++++++---------- buildtools/CPACK/src/CMakeFlags.txt | 4 +- buildtools/CPACK/src/CMakeOption.txt | 10 +- buildtools/CPACK/src/CMakePrintArgs.txt | 7 - 12 files changed, 87 insertions(+), 82 deletions(-) diff --git a/buildtools/CPACK/prog_test/prog_AC_CHECK_MCSC.c b/buildtools/CPACK/prog_test/prog_AC_CHECK_MCSC.c index 841f7718dc..4cd27ed555 100644 --- a/buildtools/CPACK/prog_test/prog_AC_CHECK_MCSC.c +++ b/buildtools/CPACK/prog_test/prog_AC_CHECK_MCSC.c @@ -2,9 +2,13 @@ #include #include +void child(void); + ucontext_t uc_child; ucontext_t uc_main; + + void child(void) { if (swapcontext(&uc_child, &uc_main) != 0) @@ -45,4 +49,5 @@ int main(int argc, char *argv[]) /* die successfully */ exit(0); + return 1; } diff --git a/buildtools/CPACK/prog_test/prog_GRAS_ARCH.c b/buildtools/CPACK/prog_test/prog_GRAS_ARCH.c index e7b0ea938e..92143243bd 100644 --- a/buildtools/CPACK/prog_test/prog_GRAS_ARCH.c +++ b/buildtools/CPACK/prog_test/prog_GRAS_ARCH.c @@ -3,7 +3,7 @@ #include #include -void main (void) +int main (void) { int c = sizeof(char); @@ -46,5 +46,6 @@ void main (void) printf("struct-void * : %d\n",res6);*/ printf("_C:%d/%d:_I:%d/%d:%d/%d:%d/%d:%d/%d:_P:%d/%d:%d/%d:_D:4/%d:8/%d:",c,res0,si,res1,i,res2,li,res3,lli,res4,v,res6,vv,res6,f,res5); + return 1; } diff --git a/buildtools/CPACK/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c b/buildtools/CPACK/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c index 5364c38c9b..e8ba5c7de9 100644 --- a/buildtools/CPACK/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c +++ b/buildtools/CPACK/prog_test/prog_GRAS_CHECK_STRUCT_COMPACTION.c @@ -2,7 +2,7 @@ #include /* offsetof() */ #include -void main (void) +int main (void) { struct s0 {char c0; double d0;}; @@ -55,4 +55,6 @@ int gras_compact_struct; if(gras_compact_struct == 1) printf("GRAS_COMPACT_STRUCT "); +return 1; + } diff --git a/buildtools/CPACK/prog_test/prog_max_size.c b/buildtools/CPACK/prog_test/prog_max_size.c index 40de34b1ff..9ffd94c4b4 100644 --- a/buildtools/CPACK/prog_test/prog_max_size.c +++ b/buildtools/CPACK/prog_test/prog_max_size.c @@ -3,7 +3,7 @@ #include #include -void main (void) +int main (void) { int c = sizeof(char); @@ -24,5 +24,6 @@ void main (void) } printf("%d",max); + return 1; } diff --git a/buildtools/CPACK/prog_test/prog_stackgrowth.c b/buildtools/CPACK/prog_test/prog_stackgrowth.c index 82f83c31a6..b69f6def1b 100644 --- a/buildtools/CPACK/prog_test/prog_stackgrowth.c +++ b/buildtools/CPACK/prog_test/prog_stackgrowth.c @@ -20,4 +20,5 @@ int main(int argc, char *argv[]) fprintf(f, "%s\n", growsdown(&x) ? "down" : "up");; fclose(f); exit(0); + return 1; } diff --git a/buildtools/CPACK/prog_test/prog_stacksetup.c b/buildtools/CPACK/prog_test/prog_stacksetup.c index 72f95bdc67..7b128a5053 100644 --- a/buildtools/CPACK/prog_test/prog_stacksetup.c +++ b/buildtools/CPACK/prog_test/prog_stacksetup.c @@ -130,4 +130,5 @@ int main(int argc, char *argv[]) fprintf(f, "%s\n", result); fclose(f); exit(0); + return 1; } diff --git a/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt index 113eac2ba8..9bcb074cab 100644 --- a/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/CMakeLists.txt @@ -29,15 +29,15 @@ set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY}) ### Setup Options include(${PROJECT_DIRECTORY}/CPACK/src/CMakeOption.txt) -### Print ARGS -include(${PROJECT_DIRECTORY}/CPACK/src/CMakePrintArgs.txt) - ### Make the *.h files with *.h.in files include(${PROJECT_DIRECTORY}/CPACK/src/CMakeCompleteInFiles.txt) ### Define source packages for Libs include(${PROJECT_DIRECTORY}/CPACK/src/CMakeDefinePackages.txt) +### Setup gcc flags +include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFlags.txt) + ### Make Libs and Exes include(${PROJECT_DIRECTORY}/CPACK/src/CMakeMakeExeLib.txt) @@ -48,4 +48,7 @@ include(${PROJECT_DIRECTORY}/CPACK/src/CTestConfig.cmake) ### Setup the distrib include(${PROJECT_DIRECTORY}/CPACK/src/CMakeDistrib.txt) +### Print ARGS +include(${PROJECT_DIRECTORY}/CPACK/src/CMakePrintArgs.txt) + INCLUDE(Dart) diff --git a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt index 9662c6c77e..434948ff6f 100644 --- a/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt +++ b/buildtools/CPACK/simgrid_CMakeList/examples/smpi/CMakeLists.txt @@ -5,7 +5,7 @@ set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib") set(flags "-Dmain=smpi_simulated_main") set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include -I${PROJECT_DIRECTORY}/include/smpi") -set(CMAKE_CXX_FLAGS -fprofile-arcs -ftest-coverage) +set(CMAKE_C_FLAGS "") add_definitions (${INCLUDES} ${flags} -fprofile-arcs -ftest-coverage) add_executable(alltoall2 alltoall2.c ) diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index 8d995c55f7..4578d9487f 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -98,16 +98,14 @@ try_run(RUN_mcsc_VAR COMPILE_mcsc_VAR ${PROJECT_DIRECTORY} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_AC_CHECK_MCSC.c ) - file(READ "${PROJECT_DIRECTORY}/conftestval" mcsc) if(mcsc MATCHES "yes") set(mcsc "yes") elseif(mcsc MATCHES "yes") set(mcsc "no") endif(mcsc MATCHES "yes") - +CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) if(mcsc MATCHES "no" AND pthread MATCHES "no") - CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) if(HAVE_WINDOWS_H) set(windows_context "yes") set(IS_WINDOWS 1) @@ -116,57 +114,58 @@ if(mcsc MATCHES "no" AND pthread MATCHES "no") endif(HAVE_WINDOWS_H) endif(mcsc MATCHES "no" AND pthread MATCHES "no") -if(NOT disable_context AND with_context MATCHES "ucontext" AND mcsc MATCHES "no") +if(with_context MATCHES "ucontext" AND mcsc MATCHES "no") message(FATAL_ERROR "-Dwith-context=ucontext specified but ucontext unusable.") -endif(NOT disable_context AND with_context MATCHES "ucontext" AND mcsc MATCHES "no") - -if(NOT disable_context) - set(with_context_ok 0) - if(with_context MATCHES "windows") - set(with_context_ok 1) - endif(with_context MATCHES "windows") - - if(with_context MATCHES "pthreads") - set(with_context_ok 1) - set(with_context "pthread") - endif(with_context MATCHES "pthreads") - - if(with_context MATCHES "auto") - set(with_context_ok 1) - set(with_context "ucontext") - message("with_context auto change to ucontext") - endif(with_context MATCHES "auto") - - if(with_context MATCHES "ucontext") - set(with_context_ok 1) - if(mcsc MATCHES "yes") - set(CONTEXT_UCONTEXT 1) - CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) - else(mcsc MATCHES "yes") - if(windows_context MATCHES "yes") - set(with_context "windows") - else(windows_context MATCHES "yes") - set(with_context "pthread") - endif(windows_context MATCHES "yes") - endif(mcsc MATCHES "yes") - endif(with_context MATCHES "ucontext") - - if(with_context MATCHES "pthread") - set(with_context_ok 1) - if(pthread MATCHES "no") - message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).") - endif(pthread MATCHES "no") - SET(CONTEXT_THREADS 1) - endif(with_context MATCHES "pthread") - - if(with_context MATCHES "ucontext") - SET(CONTEXT_THREADS 0) - endif(with_context MATCHES "ucontext") - - if(NOT with_context_ok) - message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread") - endif(NOT with_context_ok) -endif(NOT disable_context) +endif(with_context MATCHES "ucontext" AND mcsc MATCHES "no") + +set(with_context_ok 0) +if(with_context MATCHES "windows") + set(with_context_ok 1) + if(NOT HAVE_WINDOWS_H) + message(FATAL_ERROR "no appropriate backend found windows") + endif(NOT HAVE_WINDOWS_H) +endif(with_context MATCHES "windows") + +if(with_context MATCHES "pthreads") + set(with_context_ok 1) + set(with_context "pthread") +endif(with_context MATCHES "pthreads") + +if(with_context MATCHES "auto") + set(with_context_ok 1) + set(with_context "ucontext") + message("with_context auto change to ucontext") +endif(with_context MATCHES "auto") + +if(with_context MATCHES "ucontext") + set(with_context_ok 1) + if(mcsc MATCHES "yes") + set(CONTEXT_UCONTEXT 1) + CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) + else(mcsc MATCHES "yes") + if(windows_context MATCHES "yes") + set(with_context "windows") + else(windows_context MATCHES "yes") + set(with_context "pthread") + endif(windows_context MATCHES "yes") + endif(mcsc MATCHES "yes") +endif(with_context MATCHES "ucontext") + +if(with_context MATCHES "pthread") + set(with_context_ok 1) + if(pthread MATCHES "no") + message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).") + endif(pthread MATCHES "no") + SET(CONTEXT_THREADS 1) +endif(with_context MATCHES "pthread") + +if(with_context MATCHES "ucontext") + SET(CONTEXT_THREADS 0) +endif(with_context MATCHES "ucontext") + +if(NOT with_context_ok) + message(FATAL_ERROR "-Dwith-context must be either ucontext or pthread") +endif(NOT with_context_ok) #message("CONTEXT_THREADS ${CONTEXT_THREADS}") @@ -316,18 +315,11 @@ if(HAVE_MAKECONTEXT) set(makecontext_CPPFLAGS_2 "-DOSX") #message("SYSTEM OSX") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - 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) - if(COMPILE_makecontext_VAR) - set(makecontext_type "ok") - elseif(COMPILE_makecontext_VAR) - set(makecontext_type "guessed") - endif(COMPILE_makecontext_VAR) + 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) + + find_program(CAT_EXE NAMES cat) 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") diff --git a/buildtools/CPACK/src/CMakeFlags.txt b/buildtools/CPACK/src/CMakeFlags.txt index 88790e14f6..2a675492f3 100644 --- a/buildtools/CPACK/src/CMakeFlags.txt +++ b/buildtools/CPACK/src/CMakeFlags.txt @@ -13,6 +13,6 @@ if(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc") set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") endif(enable_compile_optimizations) -set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}") + set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}") -endif(CMAKE_C_COMPILER:FILEPATH MATCHES "/usr/bin/gcc") +endif(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc") diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt index 3dbe0d900e..24cd32016b 100644 --- a/buildtools/CPACK/src/CMakeOption.txt +++ b/buildtools/CPACK/src/CMakeOption.txt @@ -1,9 +1,16 @@ ### ARGs use -D[var]=[ON/OFF] or [1/0] or [true/false](see after) ### ex: cmake -Ddisable_java=ON -Ddisable_gtnets=ON ./ +if(disable_gtnets) + set(gtnets_path "none" CACHE TYPE INTERNAL FORCE) +endif(disable_gtnets) + +if(NOT with_context) + set(with_context "auto" CACHE TYPE INTERNAL FORCE) +endif(NOT with_context) + #SET(disable_java ON) #default value #SET(disable_gtnets ON) -#SET(disable_context ON) #SET(disable_lua ON) #SET(init OFF) #SET(MAINTAINER_MODE OFF) @@ -13,7 +20,6 @@ option(MAINTAINER_MODE "Permit to make flex and flexml files." OFF) option(supernovae "Supernovae mode." OFF) option(disable_java "This variable set the java context." ON) option(disable_gtnets "This variable set the gtnets context." ON) -option(disable_context "This variable set the context." ON) option(disable_lua "This variable set lua use." ON) option(enable_compile_warnings "" OFF) option(enable_compile_optimizations "" OFF) diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt index 572e66806c..d68b6e5f8e 100644 --- a/buildtools/CPACK/src/CMakePrintArgs.txt +++ b/buildtools/CPACK/src/CMakePrintArgs.txt @@ -1,13 +1,6 @@ exec_program("echo `${CMAKE_C_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_C_VERSION") exec_program("echo `${CMAKE_CXX_COMPILER} --version | grep -E [0-9].[0-9].[0-9]$`" OUTPUT_VARIABLE "COMPILER_CXX_VERSION") -if(disable_context) - set(with_context "none" CACHE TYPE INTERNAL FORCE) -endif(disable_context) -if(disable_gtnets) - set(gtnets_path "none" CACHE TYPE INTERNAL FORCE) -endif(disable_gtnets) - message("\nConfiguration of package `simgrid' (revision ${SVN_VERSION}${GIT_VERSION}) on arch (=${GRAS_THISARCH}):") message("") message(" Compiler: c++ : ${CMAKE_CXX_COMPILER}") -- 2.20.1