-- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 -- cgit v0.12 From f90bdaf38eb212ce41b542f7c4b2398ac4c2e01d Mon Sep 17 00:00:00 2001 From: "Miguel A. Figueroa-Villanueva" Date: Sun, 9 May 2010 13:27:58 -0400 Subject: BUG #10209: Fixed FindwxWidget CXX flags parsing error. Was not removing definition flags (-D...) from cxx flags, when the definition flag was last in the list returned from wx-config. --HG-- extra : rebase_source : 3452c52b92717f181e902abef38c1e2718ce3b27 --- Modules/FindwxWidgets.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 05c6625..85c6568 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -723,10 +723,13 @@ ELSE(wxWidgets_FIND_STYLE STREQUAL "win32") DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") - # parse definitions from cxxflags; drop -D* from CXXFLAGS and the -D prefix + # parse definitions from cxxflags; + # drop -D* from CXXFLAGS and the -D prefix STRING(REGEX MATCHALL "-D[^;]+" wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}") - STRING(REGEX REPLACE "-D[^;]+;" "" + STRING(REGEX REPLACE "-D[^;]+(;|$)" "" + wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") + STRING(REGEX REPLACE ";$" "" wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") STRING(REPLACE "-D" "" wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}") -- cgit v0.12 From a8fd6e71809bf47820586ead1cfa6b286513e6ab Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 11 May 2010 00:31:56 +0200 Subject: -use the HINTS keyword for finding FindKDE4Internal.cmake Alex --- Modules/FindKDE4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake index 12fd304..42a1530 100644 --- a/Modules/FindKDE4.cmake +++ b/Modules/FindKDE4.cmake @@ -73,7 +73,7 @@ IF(NOT KDE4_DATA_DIR) EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) # then check the data dirs for FindKDE4Internal.cmake - FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR}) + FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake HINTS ${_data_DIR}) ENDIF(KDE4_KDECONFIG_EXECUTABLE) ENDIF(CMAKE_CROSSCOMPILING) ENDIF(NOT KDE4_DATA_DIR) -- cgit v0.12 From 48fc3d3efa3033bca104bb480bf1083e477feb84 Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Tue, 11 May 2010 00:01:04 -0400 Subject: KWSys Nightly Date Stamp --- Source/kwsys/kwsysDateStamp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 1da202b..23d5781 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 05) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 10) +SET(KWSYS_DATE_STAMP_DAY 11) -- cgit v0.12 From 83b00e00e2b6d3ffa5f752922b3da36372c5342f Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 11 May 2010 09:29:55 -0400 Subject: Add GITCommand key value pair. --- Modules/DartConfiguration.tcl.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 0b05865..85b4138 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -46,6 +46,10 @@ CVSUpdateOptions: @CVS_UPDATE_OPTIONS@ SVNCommand: @SVNCOMMAND@ SVNUpdateOptions: @SVN_UPDATE_OPTIONS@ +# Git options +GITCommand: @GITCOMMAND@ +GITUpdateOptions: @GIT_UPDATE_OPTIONS@ + # Generic update command UpdateCommand: @UPDATE_COMMAND@ UpdateOptions: @UPDATE_OPTIONS@ -- cgit v0.12 From 2e25606a48f1867a5e328216b8f4a23f43ce329b Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 11 May 2010 09:30:41 -0400 Subject: Disable purify on unix, as it works differently and ctest can't use it. --- Tests/CTestTest2/test.cmake.in | 8 ++++++++ Tests/CTestTest3/test.cmake.in | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in index cccd8c1..f6ec198 100644 --- a/Tests/CTestTest2/test.cmake.in +++ b/Tests/CTestTest2/test.cmake.in @@ -15,6 +15,14 @@ SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@") SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS "@MEMORYCHECK_COMMAND_OPTIONS@") SET(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@") SET(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") +# for unix purify has to be used as a linker, and +# will not work with ctest. So disable it so +# that it is not attempted. +IF(UNIX) + IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify) + SET(CTEST_MEMORYCHECK_COMMAND) + ENDIF() +ENDIF() #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY}) diff --git a/Tests/CTestTest3/test.cmake.in b/Tests/CTestTest3/test.cmake.in index 1cf5a88..1e8ea50 100644 --- a/Tests/CTestTest3/test.cmake.in +++ b/Tests/CTestTest3/test.cmake.in @@ -25,6 +25,14 @@ SET(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") SET(CTEST_MEMORYCHECK_COMMAND "@MEMORYCHECK_COMMAND@") SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@") SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS "@MEMORYCHECK_COMMAND_OPTIONS@") +# for unix purify has to be used as a linker, and +# will not work with ctest. So disable it so +# that it is not attempted. +IF(UNIX) + IF("${CTEST_MEMORYCHECK_COMMAND}" MATCHES purify) + SET(CTEST_MEMORYCHECK_COMMAND) + ENDIF() +ENDIF() SET(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@") SET(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") SET(CTEST_CHECKOUT_COMMAND "\"${CTEST_UPDATE_COMMAND}\" -q -z3 \"-d:pserver:anoncvs@www.cmake.org:/cvsroot/KWSys\" co -r CTest-Testing-Tag KWSys") -- cgit v0.12 From ed5a140aa4e00d9f0f5bbb29e0e6249c161b989c Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 11 May 2010 09:34:12 -0400 Subject: Fix for Bug#10700, COMPILE_DEFINITIONS_MINSIZEREL missing REL part. Also remove some trailing whitespace. --- Source/cmLocalVisualStudio6Generator.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 2cf840d..89bfd05 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1420,7 +1420,7 @@ void cmLocalVisualStudio6Generator outputNameDebug.c_str()); cmSystemTools::ReplaceString(line, "OUTPUT_NAME_RELEASE", outputNameRelease.c_str()); - cmSystemTools::ReplaceString(line, "OUTPUT_NAME_MINSIZEREL", + cmSystemTools::ReplaceString(line, "OUTPUT_NAME_MINSIZEREL", outputNameMinSizeRel.c_str()); cmSystemTools::ReplaceString(line, "OUTPUT_NAME_RELWITHDEBINFO", outputNameRelWithDebInfo.c_str()); @@ -1431,7 +1431,7 @@ void cmLocalVisualStudio6Generator optionsDebug.c_str()); cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_RELEASE", optionsRelease.c_str()); - cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_MINSIZEREL", + cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_MINSIZEREL", optionsMinSizeRel.c_str()); cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_RELWITHDEBINFO", optionsRelWithDebInfo.c_str()); @@ -1619,7 +1619,7 @@ void cmLocalVisualStudio6Generator // There are not separate CXX and C template files, so we use the same // variable names. The previous code sets up flags* variables to contain // the correct C or CXX flags - cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL", + cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL", flagsMinSize.c_str()); cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_DEBUG", flagsDebug.c_str()); @@ -1629,7 +1629,7 @@ void cmLocalVisualStudio6Generator flagsRelease.c_str()); cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str()); - cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_MINSIZE", + cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_MINSIZEREL", minsizeDefines.c_str()); cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_DEBUG", debugDefines.c_str()); -- cgit v0.12 From 9c0937f8c2df63745bfe63db699a0edcb71950f3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 11 May 2010 13:34:54 -0400 Subject: KWSys: Process tree kill for kFreeBSD, GNU/Hurd kFreeBSD and Hurd have the same userland as Linux. This change is necessary to enable kwsysProcessKill() to kill child processes on kFreeBSD. The bug was detected by CTestTestTimeout test. Patch from "Modestas Vainius ". See issue #10432. --- Source/kwsys/ProcessUNIX.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c index b368901..9cb787a 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c @@ -2374,7 +2374,7 @@ static pid_t kwsysProcessFork(kwsysProcess* cp, corresponding parsing format string. The parsing format should have two integers to store: the pid and then the ppid. */ #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) + || defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__) # define KWSYSPE_PS_COMMAND "ps axo pid,ppid" # define KWSYSPE_PS_FORMAT "%d %d\n" #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \ -- cgit v0.12 From 0d88e19fefd44d3c243f010f5226f62c34b78b1f Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Sun, 9 May 2010 14:41:15 +0200 Subject: BUG: 0009840 Fix case when only Java is available by implementing COMP Runtime --- Modules/FindJava.cmake | 51 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 9e2a640..4cd4389 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -24,9 +24,18 @@ # and # Java_VERSION = 1.6.0 # -# NOTE: At the moment this script will look for javac and jar component, -# which means it will fail if javac or jar is not found.:w -# See Bug #9840 +# For these components the following variables are set: +# +# Java_FOUND - TRUE if all components are found. +# Java_INCLUDE_DIRS - Full paths to all include dirs. +# Java_LIBRARIES - Full paths to all libraries. +# Java__FOUND - TRUE if is found. +# +# Example Usages: +# FIND_PACKAGE(Java) +# FIND_PACKAGE(Java COMPONENTS Runtime) +# FIND_PACKAGE(Java COMPONENTS Development) +# #============================================================================= # Copyright 2002-2009 Kitware, Inc. @@ -152,12 +161,36 @@ FIND_PROGRAM(Java_JAVAC_EXECUTABLE ) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Java DEFAULT_MSG - Java_JAVA_EXECUTABLE - Java_JAR_EXECUTABLE - Java_JAVAC_EXECUTABLE - _java_version_acceptable -) +if(Java_FIND_COMPONENTS) + foreach(component ${Java_FIND_COMPONENTS}) + # User just want to execute some Java byte-compiled + if(component STREQUAL "Runtime") + find_package_handle_standard_args(Java DEFAULT_MSG + Java_JAVA_EXECUTABLE + _java_version_acceptable + ) + elseif(component STREQUAL "Development") + find_package_handle_standard_args(Java DEFAULT_MSG + Java_JAVA_EXECUTABLE + Java_JAR_EXECUTABLE + Java_JAVAC_EXECUTABLE + _java_version_acceptable + ) + else() + message(FATAL_ERROR "Comp: ${component} is not handled") + endif() + set(Java_${component}_FOUND TRUE) + endforeach(component) +else() + # Check for everything + find_package_handle_standard_args(Java DEFAULT_MSG + Java_JAVA_EXECUTABLE + Java_JAR_EXECUTABLE + Java_JAVAC_EXECUTABLE + _java_version_acceptable + ) +endif() + MARK_AS_ADVANCED( Java_JAVA_EXECUTABLE -- cgit v0.12 From 87dbbf9cbe1039ae370edbe19b825c6b596ece95 Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Wed, 12 May 2010 00:01:13 -0400 Subject: KWSys Nightly Date Stamp --- Source/kwsys/kwsysDateStamp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 23d5781..8fd851f 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 05) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 11) +SET(KWSYS_DATE_STAMP_DAY 12) -- cgit v0.12 From f8593092aeff398c49ff88b19dcfd759633287df Mon Sep 17 00:00:00 2001 From: Zach Mullen Date: Wed, 12 May 2010 09:37:43 -0400 Subject: Fix shadowed local warning in coverage handler --- Source/CTest/cmCTestCoverageHandler.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index e66af24..da5aed0 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -2031,11 +2031,11 @@ std::set cmCTestCoverageHandler::FindUncoveredFiles( std::string glob = cont->SourceDir + "/" + *i; gl.FindFiles(glob); std::vector files = gl.GetFiles(); - for(std::vector::iterator i = files.begin(); - i != files.end(); ++i) + for(std::vector::iterator f = files.begin(); + f != files.end(); ++f) { extraMatches.insert(this->CTest->GetShortPathToFile( - i->c_str())); + f->c_str())); } } -- cgit v0.12 From f88a0a3514cebb36fc1f56e05ef0bfa4aec617ab Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 12 May 2010 09:37:42 -0400 Subject: Silence warnings on sgi compiler. --- Source/kwsys/Configure.h.in | 4 ++++ Source/kwsys/hashtable.hxx.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Source/kwsys/Configure.h.in b/Source/kwsys/Configure.h.in index 97b2c5d..15986cf 100644 --- a/Source/kwsys/Configure.h.in +++ b/Source/kwsys/Configure.h.in @@ -28,6 +28,10 @@ # if defined(__INTEL_COMPILER) # pragma warning (disable: 1572) /* floating-point equality test */ # endif +# if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 3970 /* pointer to int conversion */ +# pragma set woff 3968 /* 64 bit conversion */ +# endif #endif /* Whether kwsys namespace is "kwsys". */ diff --git a/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in index 2f337ba..db52fc8 100644 --- a/Source/kwsys/hashtable.hxx.in +++ b/Source/kwsys/hashtable.hxx.in @@ -38,6 +38,7 @@ # pragma warn -8027 /* 'for' not inlined. */ # pragma warn -8026 /* 'exception' not inlined. */ #endif + #ifndef @KWSYS_NAMESPACE@_hashtable_hxx #define @KWSYS_NAMESPACE@_hashtable_hxx @@ -57,6 +58,9 @@ # pragma warning (disable:4786) # pragma warning (disable:4512) /* no assignment operator for class */ #endif +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 3970 /* pointer to int conversion */ 3321 3968 +#endif #if @KWSYS_NAMESPACE@_STL_HAS_ALLOCATOR_TEMPLATE # define @KWSYS_NAMESPACE@_HASH_DEFAULT_ALLOCATOR(T) @KWSYS_NAMESPACE@_stl::allocator< T > -- cgit v0.12 From 28007f433a7dedb9fa4b11b6b58fab595fc479f9 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 12 May 2010 10:09:50 -0400 Subject: Exclude warnings for Xcode --- CTestCustom.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index d6c0dc6..f316852 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -31,6 +31,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION "Warning: public.*BZ2_bz.*in module.*bzlib.*clashes with prior module.*bzlib.*" "Warning: public.*_archive.*clashes with prior module.*" "Warning: LINN32: Last line.*is less.*" + "warning.*directory name.*CMake-Xcode/bin/Release.*does not exist.*" "stl_deque.h:1051" "(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)" "[Qq]t([Cc]ore|[Gg]ui).*warning.*conversion.*may alter its value" -- cgit v0.12 From a179cc956a0087f72b2cb75914df58344024c680 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 12 May 2010 10:22:55 -0400 Subject: Remove conversion warning. --- Source/cmDocumentationFormatterText.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmDocumentationFormatterText.cxx b/Source/cmDocumentationFormatterText.cxx index 078b890..0b04b73 100644 --- a/Source/cmDocumentationFormatterText.cxx +++ b/Source/cmDocumentationFormatterText.cxx @@ -96,7 +96,7 @@ void cmDocumentationFormatterText::PrintColumn(std::ostream& os, { // Print text arranged in an indented column of fixed witdh. const char* l = text; - int column = 0; + long column = 0; bool newSentence = false; bool firstLine = true; int width = this->TextWidth - static_cast(strlen(this->TextIndent)); -- cgit v0.12 From 288a58a614fa4bce8cb0a29876b09f22ad44c7ad Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 12 May 2010 10:40:12 -0400 Subject: Ignore some more sgi warnings. --- Source/cmStandardIncludes.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 5db0200..9b9cb3b 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -45,6 +45,7 @@ // This is a hack to prevent warnings about these functions being // declared but not referenced. #if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 3970 /* conversion from pointer to same-sized */ # include class cmStandardIncludesHack { -- cgit v0.12 From 418e600006be393fb5b64644f922a58596178be1 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 12 May 2010 10:41:06 -0400 Subject: Try to remove some warnings. --- Source/cmELF.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 763fdd8..147f6ac 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -687,7 +687,7 @@ cmELFInternalImpl::GetDynamicSectionString(int tag) // The value has been read successfully. Report it. se.Position = static_cast(strtab.sh_offset + first); se.Size = last - first; - se.IndexInSection = di - this->DynamicSectionEntries.begin(); + se.IndexInSection = static_cast(di - this->DynamicSectionEntries.begin()); return &se; } } -- cgit v0.12 From 08b56ae3be5635cd84defe331e1bfef86df63067 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Wed, 12 May 2010 22:02:43 +0200 Subject: -make CMAKE_ASM_FLAGS_INIT and friends work (#10577) Alex --- Modules/CMakeASMInformation.cmake | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake index c495810..0fad25d 100644 --- a/Modules/CMakeASMInformation.cmake +++ b/Modules/CMakeASMInformation.cmake @@ -42,10 +42,45 @@ IF(NOT _INCLUDED_FILE) INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-ASM OPTIONAL) ENDIF(NOT _INCLUDED_FILE) +# Set default assembler file extensions: IF(NOT CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS) SET(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;S;asm) ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS) + +# Support for CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT and friends: +SET(CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT "$ENV{ASM${ASM_DIALECT}FLAGS} ${CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT}") +# avoid just having a space as the initial value for the cache +IF(CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT STREQUAL " ") + SET(CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT) +ENDIF(CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT STREQUAL " ") +SET (CMAKE_ASM${ASM_DIALECT}_FLAGS "${CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT}" CACHE STRING + "Flags used by the assembler during all build types.") + +IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) +# default build type is none + IF(NOT CMAKE_NO_BUILD_TYPE) + SET (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING + "Choose the type of build, options are: None, Debug Release RelWithDebInfo MinSizeRel.") + ENDIF(NOT CMAKE_NO_BUILD_TYPE) + SET (CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG "${CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG_INIT}" CACHE STRING + "Flags used by the assembler during debug builds.") + SET (CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL "${CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL_INIT}" CACHE STRING + "Flags used by the assembler during release minsize builds.") + SET (CMAKE_ASM${ASM_DIALECT}_FLAGS_RELEASE "${CMAKE_ASM${ASM_DIALECT}_FLAGS_RELEASE_INIT}" CACHE STRING + "Flags used by the assembler during release builds.") + SET (CMAKE_ASM${ASM_DIALECT}_FLAGS_RELWITHDEBINFO "${CMAKE_ASM${ASM_DIALECT}_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING + "Flags used by the assembler during Release with Debug Info builds.") +ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) + +MARK_AS_ADVANCED(CMAKE_ASM${ASM_DIALECT}_FLAGS + CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG + CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL + CMAKE_ASM${ASM_DIALECT}_FLAGS_RELEASE + CMAKE_ASM${ASM_DIALECT}_FLAGS_RELWITHDEBINFO + ) + + IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT) SET(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " -o ") ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT) -- cgit v0.12 From 6283ce67382ce140bf610ccaecb34eff19363b87 Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Thu, 13 May 2010 00:01:03 -0400 Subject: KWSys Nightly Date Stamp --- Source/kwsys/kwsysDateStamp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 8fd851f..310bc60 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 05) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 12) +SET(KWSYS_DATE_STAMP_DAY 13) -- cgit v0.12 From 4cde0b1a5ff1f3060bf58d402fb63cebf9d13cfb Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Thu, 13 May 2010 06:34:33 +0200 Subject: FindZLIB: make sure zlib.h exists before reading it --- Modules/FindZLIB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 499ae77..b437e6b 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -36,7 +36,7 @@ FIND_LIBRARY(ZLIB_LIBRARY ) MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) -IF (ZLIB_INCLUDE_DIR) +IF (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") FILE(READ "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H) STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}") ENDIF() -- cgit v0.12 From 893e22e818398e7ba4fb1f6c95682d1fe4e54067 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 13 May 2010 11:24:34 -0400 Subject: Expand the regular expression for ignoring xcode missing directories. --- CTestCustom.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index f316852..59ba4c6 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -31,7 +31,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION "Warning: public.*BZ2_bz.*in module.*bzlib.*clashes with prior module.*bzlib.*" "Warning: public.*_archive.*clashes with prior module.*" "Warning: LINN32: Last line.*is less.*" - "warning.*directory name.*CMake-Xcode/bin/Release.*does not exist.*" + "warning.*directory name.*CMake-Xcode.*/bin/.*does not exist.*" "stl_deque.h:1051" "(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)" "[Qq]t([Cc]ore|[Gg]ui).*warning.*conversion.*may alter its value" -- cgit v0.12 From e740887d3a19e23d279cfc5c98e7f39a7a79f1e6 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 13 May 2010 11:27:16 -0400 Subject: Ignore OpenBSD warnings for use of strcpy, etc. --- CTestCustom.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index 59ba4c6..5eeca3c 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -36,6 +36,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION "(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)" "[Qq]t([Cc]ore|[Gg]ui).*warning.*conversion.*may alter its value" "Parser.cxx.*warning.*2111-D.*statement is unreachable" + "warning:.*is often misused, please use.*" "CMakeSetupManifest.xml.*manifest authoring warning.*Unrecognized Element" ) -- cgit v0.12 From 279b9f22c418656c9a1a24db5d1bc690793fcdc7 Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Fri, 14 May 2010 00:01:02 -0400 Subject: KWSys Nightly Date Stamp --- Source/kwsys/kwsysDateStamp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 310bc60..5ba90a8 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 05) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 13) +SET(KWSYS_DATE_STAMP_DAY 14) -- cgit v0.12