From 5797d41ca9730de850f181bbf9383ac187ee836b Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 11 Feb 2010 12:51:34 +0000 Subject: [PATCH] Add flag options. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7081 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/src/CMakeCompleteInFiles.txt | 133 +++++++++--------- buildtools/CPACK/src/CMakeFlags.txt | 18 +++ buildtools/CPACK/src/CMakeMakeExeLib.txt | 9 +- buildtools/CPACK/src/CMakeOption.txt | 3 +- buildtools/CPACK/src/CMakePrintArgs.txt | 47 +++++-- buildtools/CPACK/src/CMakeTest.txt | 2 +- 6 files changed, 125 insertions(+), 87 deletions(-) create mode 100644 buildtools/CPACK/src/CMakeFlags.txt diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt index 67fe25f93b..8d995c55f7 100644 --- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt +++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt @@ -2,8 +2,9 @@ include(CheckFunctionExists) include(CheckIncludeFile) include(CheckIncludeFiles) include(CheckLibraryExists) +set(CONTEXT_UCONTEXT 0) +SET(CONTEXT_THREADS 0) -message("\n_______CONTEXT________") #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT JAVA if(disable_java) @@ -20,7 +21,7 @@ else(disable_java) SET(HAVE_JAVA 0) endif(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH) endif(disable_java) -message("HAVE_JAVA ${HAVE_JAVA}") +#message("HAVE_JAVA ${HAVE_JAVA}") #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT GTNETS @@ -41,7 +42,7 @@ else(disable_gtnets) add_definitions(${GTNETS_LDFLAGS}) endif(COMPILE_GTNETS_VAR) endif(disable_gtnets) -message("HAVE_GTNETS ${HAVE_GTNETS}") +#message("HAVE_GTNETS ${HAVE_GTNETS}") #-------------------------------------------------------------------------------------------------- ### Initialize of CONTEXT THREADS @@ -64,7 +65,7 @@ if(pthread MATCHES "yes") else(HAVE_SEM_INIT_run) set(HAVE_SEM_INIT 1) endif(HAVE_SEM_INIT_run) - message("HAVE_SEM_INIT ${HAVE_SEM_INIT}") + #message("HAVE_SEM_INIT ${HAVE_SEM_INIT}") endif(HAVE_SEM_INIT_LIB) ### HAVE_SEM_TIMEDWAIT @@ -76,7 +77,7 @@ if(pthread MATCHES "yes") else(HAVE_SEM_TIMEDWAIT_run) set(HAVE_SEM_TIMEDWAIT 1) endif(HAVE_SEM_TIMEDWAIT_run) - message("HAVE_SEM_TIMEDWAIT ${HAVE_SEM_TIMEDWAIT}") + #message("HAVE_SEM_TIMEDWAIT ${HAVE_SEM_TIMEDWAIT}") endif(HAVE_SEM_TIMEDWAIT_LIB) ### HAVE_MUTEX_TIMEDLOCK @@ -88,7 +89,7 @@ if(pthread MATCHES "yes") else(HAVE_MUTEX_TIMEDLOCK_run) set(HAVE_MUTEX_TIMEDLOCK 1) endif(HAVE_MUTEX_TIMEDLOCK_run) - message("HAVE_MUTEX_TIMEDLOCK ${HAVE_MUTEX_TIMEDLOCK}") + #message("HAVE_MUTEX_TIMEDLOCK ${HAVE_MUTEX_TIMEDLOCK}") endif(HAVE_MUTEX_TIMEDLOCK_LIB) endif(pthread MATCHES "yes") @@ -111,7 +112,7 @@ if(mcsc MATCHES "no" AND pthread MATCHES "no") set(windows_context "yes") set(IS_WINDOWS 1) elseif(HAVE_WINDOWS_H) - message("no appropriate backend found") + message(FATAL_ERROR "no appropriate backend found") endif(HAVE_WINDOWS_H) endif(mcsc MATCHES "no" AND pthread MATCHES "no") @@ -168,39 +169,39 @@ if(NOT disable_context) endif(NOT disable_context) -message("CONTEXT_THREADS ${CONTEXT_THREADS}") -message("CONTEXT_UCONTEXT ${CONTEXT_UCONTEXT}") - +#message("CONTEXT_THREADS ${CONTEXT_THREADS}") +#message("CONTEXT_UCONTEXT ${CONTEXT_UCONTEXT}") +set(HAVE_LUA 0) if(NOT disable_lua) CHECK_INCLUDE_FILE(lua5.1/lualib.h HAVE_LUA5_1_LUALIB_H) - message("HAVE_LUA5_1_LUALIB_H ${HAVE_LUA5_1_LUALIB_H}") + #message("HAVE_LUA5_1_LUALIB_H ${HAVE_LUA5_1_LUALIB_H}") if(HAVE_LUA5_1_LUALIB_H) set(HAVE_LUA 1) endif(HAVE_LUA5_1_LUALIB_H) endif(NOT disable_lua) -message("HAVE_LUA ${HAVE_LUA}") +#message("HAVE_LUA ${HAVE_LUA}") -message("______END_CONTEXT______") +#message("______END_CONTEXT______") ############### ## SVN version check ## -message("\n__________SVN__________") +#message("\n__________SVN__________") if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) #exec_program("svn up ${PROJECT_DIRECTORY}") find_file(SVN ".svn" ${PROJECT_DIRECTORY}) exec_program("svnversion ${PROJECT_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION") - message("SVN_VERSION ${SVN_VERSION}") + #message("SVN_VERSION ${SVN_VERSION}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn) if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) find_file(GIT ".git" ${PROJECT_DIRECTORY}) exec_program("git --git-dir=${PROJECT_DIRECTORY} log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION") - message("GIT_VERSION ${GIT_VERSION}") + #message("GIT_VERSION ${GIT_VERSION}") endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git) -message("________END_SVN________") +#message("________END_SVN________\n") -message("\n_____GRAS_&_SIMGRID____") +#message("\n_____GRAS_&_SIMGRID____") ################################### ## SimGrid and GRAS specific checks ## @@ -219,66 +220,66 @@ else(BIGENDIAN) set(val_big "l${var1}") set(GRAS_BIGENDIAN 0) endif(BIGENDIAN) -message("GRAS_BIGENDIAN ${GRAS_BIGENDIAN}") -message("${val_big}") +#message("GRAS_BIGENDIAN ${GRAS_BIGENDIAN}") +#message("${val_big}") if(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:") - message("gras_arch=0; gras_size=32; gras_arch_name=little32_1;") + #message("gras_arch=0; gras_size=32; gras_arch_name=little32_1;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 0) endif(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") - message("gras_arch=1; gras_size=32; gras_arch_name=little32_2;") + #message("gras_arch=1; gras_size=32; gras_arch_name=little32_2;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 1) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") - message("gras_arch=2; gras_size=32; gras_arch_name=little32_4;") + #message("gras_arch=2; gras_size=32; gras_arch_name=little32_4;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 2) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") - message("gras_arch=3; gras_size=32; gras_arch_name=little32_8;") + #message("gras_arch=3; gras_size=32; gras_arch_name=little32_8;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 3) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") - message("gras_arch=4; gras_size=64; gras_arch_name=little64;") + #message("gras_arch=4; gras_size=64; gras_arch_name=little64;") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 4) endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") - message("gras_arch=5; gras_size=32; gras_arch_name=big32;") + #message("gras_arch=5; gras_size=32; gras_arch_name=big32;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 5) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") - message("gras_arch=6; gras_size=32; gras_arch_name=big32_8_4;") + #message("gras_arch=6; gras_size=32; gras_arch_name=big32_8_4;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 6) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") - message("gras_arch=7; gras_size=32; gras_arch_name=big32_4;") + #message("gras_arch=7; gras_size=32; gras_arch_name=big32_4;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 7) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") - message("gras_arch=8; gras_size=32; gras_arch_name=big32_2;") + #message("gras_arch=8; gras_size=32; gras_arch_name=big32_2;") SET(GRAS_ARCH_32_BITS 1) SET(GRAS_THISARCH 8) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") - message("gras_arch=9; gras_size=64; gras_arch_name=big64;") + #message("gras_arch=9; gras_size=64; gras_arch_name=big64;") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 9) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:") if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") - message("gras_arch=10;gras_size=64; gras_arch_name=big64_8_4;") + #message("gras_arch=10;gras_size=64; gras_arch_name=big64_8_4;") SET(GRAS_ARCH_32_BITS 0) SET(GRAS_THISARCH 10) endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:") - message("GRAS_ARCH_32_BITS ${GRAS_ARCH_32_BITS}") + #message("GRAS_ARCH_32_BITS ${GRAS_ARCH_32_BITS}") # Check architecture signature end @@ -290,7 +291,7 @@ try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR separate_arguments(var2) foreach(var_tmp ${var2}) set(${var_tmp} 1) - message("${var_tmp} ${${var_tmp}}") + #message("${var_tmp} ${${var_tmp}}") endforeach(var_tmp ${var2}) # Check for [SIZEOF_MAX] @@ -300,20 +301,20 @@ try_run(RUN_SM_VAR COMPILE_SM_VAR RUN_OUTPUT_VARIABLE var3 ) SET(SIZEOF_MAX ${var3}) -message("SIZEOF_MAX ${SIZEOF_MAX}") +#message("SIZEOF_MAX ${SIZEOF_MAX}") #-------------------------------------------------------------------------------------------------- CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT) -message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}") +#message("HAVE_MAKECONTEXT ${HAVE_MAKECONTEXT}") if(HAVE_MAKECONTEXT) set(makecontext_CPPFLAGS "-DTEST_makecontext") if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(makecontext_CPPFLAGS_2 "-DOSX") - message("SYSTEM OSX") + #message("SYSTEM OSX") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR ${PROJECT_DIRECTORY} @@ -330,8 +331,8 @@ if(HAVE_MAKECONTEXT) 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}") + #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})") @@ -352,7 +353,7 @@ endif(stack MATCHES "down") if(stack MATCHES "up") set(PTH_STACKGROWTH "1") endif(stack MATCHES "up") -message("PTH_STACKGROWTH ${PTH_STACKGROWTH}") +#message("PTH_STACKGROWTH ${PTH_STACKGROWTH}") ############### @@ -377,7 +378,7 @@ SET(PRINTF_NULL_WORKING "0") else(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") SET(PRINTF_NULL_WORKING "1") endif(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN") -message("PRINTF_NULL_WORKING ${PRINTF_NULL_WORKING}") +#message("PRINTF_NULL_WORKING ${PRINTF_NULL_WORKING}") #AC_CHECK_VA_COPY @@ -432,7 +433,7 @@ foreach(fct ${diff_va}) if(${fctbis} STREQUAL "va_copy((d),(s))") set(HAVE_VA_COPY 1) - message("HAVE_VA_COPY ${HAVE_VA_COPY}") + #message("HAVE_VA_COPY ${HAVE_VA_COPY}") set(ac_cv_va_copy "C99") set(__VA_COPY_USE_C99 "va_copy((d),(s))") endif(${fctbis} STREQUAL "va_copy((d),(s))") @@ -474,9 +475,9 @@ foreach(fct ${diff_va}) if(NOT STATUS_OK) set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}") - message("__VA_COPY_USE VA_COPY_USE_${ac_cv_va_copy}") + #message("__VA_COPY_USE VA_COPY_USE_${ac_cv_va_copy}") endif(NOT STATUS_OK) - message("__VA_COPY_USE_${ac_cv_va_copy} ${fctbis}") + #message("__VA_COPY_USE_${ac_cv_va_copy} ${fctbis}") set(STATUS_OK "1") endif(RUN_VA_NULL_VAR MATCHES "FAILED_TO_RUN") @@ -485,45 +486,45 @@ endforeach(fct ${diff_va}) # Checks for header files. CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS) -message("STDC_HEADERS ${STDC_HEADERS}") +#message("STDC_HEADERS ${STDC_HEADERS}") CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME) -message("TIME_WITH_SYS_TIME ${TIME_WITH_SYS_TIME}") +#message("TIME_WITH_SYS_TIME ${TIME_WITH_SYS_TIME}") CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H) -message("HAVE_SOCKET_H ${HAVE_SOCKET_H}") +#message("HAVE_SOCKET_H ${HAVE_SOCKET_H}") CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H) -message("HAVE_STAT_H ${HAVE_STAT_H}") +#message("HAVE_STAT_H ${HAVE_STAT_H}") CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) -message("HAVE_WINDOWS_H ${HAVE_WINDOWS_H}") +#message("HAVE_WINDOWS_H ${HAVE_WINDOWS_H}") CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H) -message("HAVE_WINSOCK_H ${HAVE_WINSOCK_H}") +#message("HAVE_WINSOCK_H ${HAVE_WINSOCK_H}") CHECK_INCLUDE_FILE(winsock2.h HAVE_WINSOCK2_H) -message("HAVE_WINSOCK2_H ${HAVE_WINSOCK2_H}") +#message("HAVE_WINSOCK2_H ${HAVE_WINSOCK2_H}") CHECK_INCLUDE_FILE(sys/time.h HAVE_SYS_TIME_H) -message("HAVE_TIME_H ${HAVE_TIME_H}") +#message("HAVE_TIME_H ${HAVE_TIME_H}") CHECK_INCLUDE_FILE(errno.h HAVE_ERRNO_H) -message("HAVE_ERRNO_H ${HAVE_ERRNO_H}") +#message("HAVE_ERRNO_H ${HAVE_ERRNO_H}") CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H) -message("HAVE_UNISTD_H ${HAVE_UNISTD_H}") +#message("HAVE_UNISTD_H ${HAVE_UNISTD_H}") CHECK_INCLUDE_FILE(execinfo.h HAVE_EXECINFO_H) -message("HAVE_EXECINFO_H ${HAVE_EXECINFO_H}") +#message("HAVE_EXECINFO_H ${HAVE_EXECINFO_H}") CHECK_INCLUDE_FILE(signal.h HAVE_SIGNAL_H) -message("HAVE_SIGNAL_H ${HAVE_SIGNAL_H}") +#message("HAVE_SIGNAL_H ${HAVE_SIGNAL_H}") CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -message("HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY}") +#message("HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY}") CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP) -message("HAVE_USLEEP ${HAVE_USLEEP}") +#message("HAVE_USLEEP ${HAVE_USLEEP}") CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) -message("HAVE_GETDTABLESIZE ${HAVE_GETDTABLESIZE}") +#message("HAVE_GETDTABLESIZE ${HAVE_GETDTABLESIZE}") CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF) -message("HAVE_SYSCONF ${HAVE_SYSCONF}") +#message("HAVE_SYSCONF ${HAVE_SYSCONF}") CHECK_FUNCTION_EXISTS(readv HAVE_READV) -message("HAVE_READV ${HAVE_READV}") +#message("HAVE_READV ${HAVE_READV}") CHECK_FUNCTION_EXISTS(popen HAVE_POPEN) -message("HAVE_POPEN ${HAVE_POPEN}") +#message("HAVE_POPEN ${HAVE_POPEN}") CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL) -message("HAVE_SIGNAL ${HAVE_SIGNAL}") +#message("HAVE_SIGNAL ${HAVE_SIGNAL}") #-------------------------------------------------------------------------------------------------- ### Try execut getline command @@ -549,7 +550,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF) ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_snprintf.c ) if(CMAKE_CROSSCOMPILING) - message("SNPRINTF_FUNC CROSSCOMPILING") + #message("SNPRINTF_FUNC CROSSCOMPILING") set(RUN_SNPRINTF_FUNC "cross") endif(CMAKE_CROSSCOMPILING) @@ -558,7 +559,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF) ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_vsnprintf.c ) if(CMAKE_CROSSCOMPILING) - message("VSNPRINTF_FUNC CROSSCOMPILING") + #message("VSNPRINTF_FUNC CROSSCOMPILING") set(RUN_VSNPRINTF_FUNC "cross") endif(CMAKE_CROSSCOMPILING) set(PREFER_PORTABLE_SNPRINTF 0) @@ -568,7 +569,7 @@ if(HAVE_SNPRINTF AND HAVE_VSNPRINTF) if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") set(PREFER_PORTABLE_SNPRINTF 1) endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN") - message("PREFER_PORTABLE_SNPRINTF ${PREFER_PORTABLE_SNPRINTF}") + #message("PREFER_PORTABLE_SNPRINTF ${PREFER_PORTABLE_SNPRINTF}") endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF) ### check for asprintf function familly @@ -622,4 +623,4 @@ configure_file(${PROJECT_DIRECTORY}/CPACK/src/smpicc.in ${PROJECT_DIRECTORY}/src configure_file(${PROJECT_DIRECTORY}/CPACK/src/smpirun.in ${PROJECT_DIRECTORY}/src/smpi/smpirun @ONLY) -message("__END_GRAS_&_SIMGRID____\n") +#message("__END_GRAS_&_SIMGRID____\n") diff --git a/buildtools/CPACK/src/CMakeFlags.txt b/buildtools/CPACK/src/CMakeFlags.txt new file mode 100644 index 0000000000..88790e14f6 --- /dev/null +++ b/buildtools/CPACK/src/CMakeFlags.txt @@ -0,0 +1,18 @@ +set(warnCFLAGS "") +set(optCFLAGS "") + +set(CMAKE_C_FLAGS -g3) + +if(CMAKE_C_COMPILER MATCHES "/usr/bin/gcc") + + if(enable_compile_warnings) + set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") + endif(enable_compile_warnings) + + if(enable_compile_optimizations) + set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") + endif(enable_compile_optimizations) + +set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}") + +endif(CMAKE_C_COMPILER:FILEPATH MATCHES "/usr/bin/gcc") diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index 3b95bed3e7..0caeecc209 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -12,6 +12,8 @@ endif(supernovae) set(GRAS_DEP "pthread") set(SIMGRID_DEP "") +set(SMPI_DEP "") + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(SIMGRID_DEP "-D_XOPEN_SOURCE") endif(CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -36,11 +38,10 @@ if(HAVE_GTNETS) SET(SIMGRID_DEP_GTNETS "gtnets ") endif(HAVE_GTNETS) -message("SIMGRID_DEP \"${SIMGRID_DEP}\"") -message("GRAS_DEP \"${GRAS_DEP}\"") - ### Add definitions for compile -set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") +#set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") +#set(CMAKE_C_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} -fprofile-arcs) diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt index 32e970ac4f..3dbe0d900e 100644 --- a/buildtools/CPACK/src/CMakeOption.txt +++ b/buildtools/CPACK/src/CMakeOption.txt @@ -15,4 +15,5 @@ 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 de14587ec1..572e66806c 100644 --- a/buildtools/CPACK/src/CMakePrintArgs.txt +++ b/buildtools/CPACK/src/CMakePrintArgs.txt @@ -1,20 +1,37 @@ -message("\n________ARGS_________") -message("init ${init}") -message("supernovae ${supernovae}") -message("MAINTAINER_MODE ${MAINTAINER_MODE}") -message("disable_java ${disable_java}") -message("disable_lua ${disable_lua}") -message("disable_gtnets ${disable_gtnets}") -if(disable_gtnets) - set(gtnets_path "none" CACHE TYPE INTERNAL FORCE) -endif(disable_gtnets) -message(" -> gtnets_path \"${gtnets_path}\"") +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") -message("disable_context ${disable_context}") if(disable_context) set(with_context "none" CACHE TYPE INTERNAL FORCE) endif(disable_context) -message(" -> with_context \"${with_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}") +message(" version: ${COMPILER_CXX_VERSION}") +message(" c : ${CMAKE_C_COMPILER}") +message(" version: ${COMPILER_C_VERSION}") +message("") +message(" CFlags: ${CMAKE_C_FLAGS}") +message(" CPPFlags: ${CMAKE_CXX_FLAGS}") +message(" LDFlags: ${CMAKE_EXE_LINKER_FLAGS}") +message("") +message(" Context backend: ${with_context}") +message(" Compile Gtnets: ${HAVE_GTNETS}") +message(" path: ${gtnets_path}") +message(" Compile Java: ${HAVE_JAVA}") +message(" Compile Lua: ${HAVE_LUA}") +message("") +message(" Init mode: ${init}") +message(" Maintainer mode: ${MAINTAINER_MODE}") +message(" Supernovae mode: ${supernovae}") +message("") +message(" Simgrid dependencies: ${SIMGRID_DEP}") +message(" Gras dependencies: ${GRAS_DEP}") +message(" Smpi dependencies: ${SMPI_DEP}\n\n") + + -message("_______END_ARGS_______") -#-------------------------------------------------------------------------------------------------- diff --git a/buildtools/CPACK/src/CMakeTest.txt b/buildtools/CPACK/src/CMakeTest.txt index c93e3fead6..736924a4d6 100644 --- a/buildtools/CPACK/src/CMakeTest.txt +++ b/buildtools/CPACK/src/CMakeTest.txt @@ -227,7 +227,7 @@ ELSE(${ARCH_32_BITS}) ENDIF(${ARCH_32_BITS}) # Don't mark this one since we should fix it before 3.3.4 gets released - set_tests_properties(smpi-reduce PROPERTIES WILL_FAIL true) +# set_tests_properties(smpi-reduce PROPERTIES WILL_FAIL true) #SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 50) #SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 50) -- 2.20.1