[Cmake-commits] CMake branch, master, updated. c8c7b22323d8afe9d113a6e1783111057abbeedd
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri May 14 13:27:50 EDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via c8c7b22323d8afe9d113a6e1783111057abbeedd (commit)
via b81727621a10148508d42601229a7da0f23410e6 (commit)
via 65be87b3635f4c4ff2e91d7b509720450e75f4b6 (commit)
via ae6a50aa810e61382c2df55609b4293eb2346f1f (commit)
via 44e646701556dd47d7475650a2d27c26118ea8b8 (commit)
via f7abdff7213adc16b08fe1f6770001b773d68e09 (commit)
via bca561ee46279684b938ce766984beab493fe55d (commit)
via f2d18d6e998e96b9dbb6e07b08f208b65dc22f5e (commit)
via 521e26752b1f1e60fd5e8990416f26cb62339a78 (commit)
via 5eeaa535b3328653a83ddf5074f4661fea1eca02 (commit)
via ce9ff00f235d11ff29e59dc48ab587924df30ad2 (commit)
via 0b5288849f5c8a12e31ae38c1f25b69296bc87e9 (commit)
via 38cabcd9ff34dae427ef86b0a24ca4e56cffd746 (commit)
via 8ce275fee54cd73d1397c562ffff1ef282162d42 (commit)
via a9a2af19d4f8a15dd0c6764c791a3b25b65899da (commit)
via 83d3b1e427f1ef7aba08731cb2f1442b399f8803 (commit)
via 667b1b223f23dd1337c68fd87c3838fea0eb8aed (commit)
via aa30bd3f2aa9b46b39738da60f9593175929cd46 (commit)
via ef6b505caa339d05efba9425a24277b58884adf1 (commit)
via 408bf244dda388549dab72ea877bdba4e3326077 (commit)
via 50506090c83c30469e9b76b2782d2f9f09bbee89 (commit)
via 601ee1f735f3d3d7713af734a18c04bfeff6eef2 (commit)
from 279b9f22c418656c9a1a24db5d1bc690793fcdc7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8c7b22323d8afe9d113a6e1783111057abbeedd
commit c8c7b22323d8afe9d113a6e1783111057abbeedd
Merge: b817276 279b9f2
Author: Brad King <brad.king at kitware.com>
Date: Fri May 14 13:06:48 2010 -0400
Merge original history into fixed history
Commit f90bdaf3 ("BUG #10209: Fixed FindwxWidget CXX flags parsing
error.", 2010-05-09) was accidentally based on a "nightly start time"
merge branch and then rebased on commit e30279e7 ("KWSys Nightly Date
Stamp", 2010-05-10) by "hg-git". The rebase brought the whole nightly
merge branch along as empty commits, but the committer times were not
updated during the rebase.
The above led to a series of commit objects whose recorded committer
time predates their parent commits. This confuses Git's date-based
revision selection (like --since="$date") which assumes that commit
object times are always newer than their parents.
We resolved the problem by rebasing history since f90bdaf3 onto
e30279e7. This merge commit combines the two versions of history to
allow branches to fast-forward through here from the original history.
The first parent of this commit is the fixed history and the second
parent is the original history. Now date-based revision selection works
correctly because it can walk through the left of this merge.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b81727621a10148508d42601229a7da0f23410e6
commit b81727621a10148508d42601229a7da0f23410e6
Author: KWSys Robot <kwrobot at kitware.com>
Date: Fri May 14 00:01:02 2010 -0400
KWSys Nightly Date Stamp
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65be87b3635f4c4ff2e91d7b509720450e75f4b6
commit 65be87b3635f4c4ff2e91d7b509720450e75f4b6
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Thu May 13 11:27:16 2010 -0400
Ignore OpenBSD warnings for use of strcpy, etc.
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"
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae6a50aa810e61382c2df55609b4293eb2346f1f
commit ae6a50aa810e61382c2df55609b4293eb2346f1f
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Thu May 13 11:24:34 2010 -0400
Expand the regular expression for ignoring xcode missing directories.
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"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44e646701556dd47d7475650a2d27c26118ea8b8
commit 44e646701556dd47d7475650a2d27c26118ea8b8
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date: Thu May 13 06:34:33 2010 +0200
FindZLIB: make sure zlib.h exists before reading it
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()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7abdff7213adc16b08fe1f6770001b773d68e09
commit f7abdff7213adc16b08fe1f6770001b773d68e09
Author: KWSys Robot <kwrobot at kitware.com>
Date: Thu May 13 00:01:03 2010 -0400
KWSys Nightly Date Stamp
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bca561ee46279684b938ce766984beab493fe55d
commit bca561ee46279684b938ce766984beab493fe55d
Author: Alex Neundorf <neundorf at kde.org>
Date: Wed May 12 22:02:43 2010 +0200
-make CMAKE_ASM_FLAGS_INIT and friends work (#10577)
Alex
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 "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2d18d6e998e96b9dbb6e07b08f208b65dc22f5e
commit f2d18d6e998e96b9dbb6e07b08f208b65dc22f5e
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Wed May 12 10:41:06 2010 -0400
Try to remove some warnings.
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<Types>::GetDynamicSectionString(int tag)
// The value has been read successfully. Report it.
se.Position = static_cast<unsigned long>(strtab.sh_offset + first);
se.Size = last - first;
- se.IndexInSection = di - this->DynamicSectionEntries.begin();
+ se.IndexInSection = static_cast<int>(di - this->DynamicSectionEntries.begin());
return &se;
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=521e26752b1f1e60fd5e8990416f26cb62339a78
commit 521e26752b1f1e60fd5e8990416f26cb62339a78
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Wed May 12 10:40:12 2010 -0400
Ignore some more sgi warnings.
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 <sys/termios.h>
class cmStandardIncludesHack
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5eeaa535b3328653a83ddf5074f4661fea1eca02
commit 5eeaa535b3328653a83ddf5074f4661fea1eca02
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Wed May 12 10:22:55 2010 -0400
Remove conversion warning.
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<int>(strlen(this->TextIndent));
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce9ff00f235d11ff29e59dc48ab587924df30ad2
commit ce9ff00f235d11ff29e59dc48ab587924df30ad2
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Wed May 12 10:09:50 2010 -0400
Exclude warnings for Xcode
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"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b5288849f5c8a12e31ae38c1f25b69296bc87e9
commit 0b5288849f5c8a12e31ae38c1f25b69296bc87e9
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Wed May 12 09:37:42 2010 -0400
Silence warnings on sgi compiler.
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 at _hashtable_hxx
#define @KWSYS_NAMESPACE at _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 at _STL_HAS_ALLOCATOR_TEMPLATE
# define @KWSYS_NAMESPACE at _HASH_DEFAULT_ALLOCATOR(T) @KWSYS_NAMESPACE at _stl::allocator< T >
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38cabcd9ff34dae427ef86b0a24ca4e56cffd746
commit 38cabcd9ff34dae427ef86b0a24ca4e56cffd746
Author: Zach Mullen <zach.mullen at kitware.com>
Date: Wed May 12 09:37:43 2010 -0400
Fix shadowed local warning in coverage handler
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<std::string> cmCTestCoverageHandler::FindUncoveredFiles(
std::string glob = cont->SourceDir + "/" + *i;
gl.FindFiles(glob);
std::vector<std::string> files = gl.GetFiles();
- for(std::vector<std::string>::iterator i = files.begin();
- i != files.end(); ++i)
+ for(std::vector<std::string>::iterator f = files.begin();
+ f != files.end(); ++f)
{
extraMatches.insert(this->CTest->GetShortPathToFile(
- i->c_str()));
+ f->c_str()));
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ce275fee54cd73d1397c562ffff1ef282162d42
commit 8ce275fee54cd73d1397c562ffff1ef282162d42
Author: KWSys Robot <kwrobot at kitware.com>
Date: Wed May 12 00:01:13 2010 -0400
KWSys Nightly Date Stamp
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9a2af19d4f8a15dd0c6764c791a3b25b65899da
commit a9a2af19d4f8a15dd0c6764c791a3b25b65899da
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date: Sun May 9 14:41:15 2010 +0200
BUG: 0009840 Fix case when only Java is available by implementing COMP Runtime
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_<component>_FOUND - TRUE if <component> 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
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83d3b1e427f1ef7aba08731cb2f1442b399f8803
commit 83d3b1e427f1ef7aba08731cb2f1442b399f8803
Author: Brad King <brad.king at kitware.com>
Date: Tue May 11 13:34:54 2010 -0400
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 <modestas at vainius.eu>".
See issue #10432.
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) \
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=667b1b223f23dd1337c68fd87c3838fea0eb8aed
commit 667b1b223f23dd1337c68fd87c3838fea0eb8aed
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Tue May 11 09:34:12 2010 -0400
Fix for Bug#10700, COMPILE_DEFINITIONS_MINSIZEREL missing REL part.
Also remove some trailing whitespace.
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());
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa30bd3f2aa9b46b39738da60f9593175929cd46
commit aa30bd3f2aa9b46b39738da60f9593175929cd46
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Tue May 11 09:30:41 2010 -0400
Disable purify on unix, as it works differently and ctest can't use it.
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 at www.cmake.org:/cvsroot/KWSys\" co -r CTest-Testing-Tag KWSys")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef6b505caa339d05efba9425a24277b58884adf1
commit ef6b505caa339d05efba9425a24277b58884adf1
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date: Tue May 11 09:29:55 2010 -0400
Add GITCommand key value pair.
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@
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=408bf244dda388549dab72ea877bdba4e3326077
commit 408bf244dda388549dab72ea877bdba4e3326077
Author: KWSys Robot <kwrobot at kitware.com>
Date: Tue May 11 00:01:04 2010 -0400
KWSys Nightly Date Stamp
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50506090c83c30469e9b76b2782d2f9f09bbee89
commit 50506090c83c30469e9b76b2782d2f9f09bbee89
Author: Alex Neundorf <neundorf at kde.org>
Date: Tue May 11 00:31:56 2010 +0200
-use the HINTS keyword for finding FindKDE4Internal.cmake
Alex
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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=601ee1f735f3d3d7713af734a18c04bfeff6eef2
commit 601ee1f735f3d3d7713af734a18c04bfeff6eef2
Author: Miguel A. Figueroa-Villanueva <miguelf at ieee.org>
Date: Sun May 9 13:27:58 2010 -0400
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
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}")
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list