[Cmake-commits] CMake branch, next, updated. v2.8.5-1414-g6d765b7
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, next has been updated
via 6d765b7d49fdba2b760c3b9da8e3b771aa735655 (commit)
via f46236949e8c981703fd4b0f7b32d588c888d98d (commit)
via 14e54c4c449e2704799ab5283c6c6764472d5a0a (commit)
from a94b306697605418e0ac2a54da2ebd538c9ac72d (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=6d765b7d49fdba2b760c3b9da8e3b771aa735655
commit 6d765b7d49fdba2b760c3b9da8e3b771aa735655
Merge: a94b306 f462369
Author: David Cole david.c...@kitware.com
AuthorDate: Wed Aug 3 10:00:20 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 3 10:00:20 2011 -0400
Merge topic 'fix-12054-eliminate-findjava-noise' into next
f462369 remove extra output message from FindJava.cmake
14e54c4 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f46236949e8c981703fd4b0f7b32d588c888d98d
commit f46236949e8c981703fd4b0f7b32d588c888d98d
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Fri Apr 8 07:56:39 2011 +0200
Commit: David Cole david.c...@kitware.com
CommitDate: Wed Aug 3 09:40:10 2011 -0400
remove extra output message from FindJava.cmake
FPHSA already prints out the version number. And this line was printed on
every subsequent CMake run.
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 1b11a34..34a7077 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -130,11 +130,6 @@ IF(Java_JAVA_EXECUTABLE)
else( )
set(Java_VERSION
${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH}.${Java_VERSION_TWEAK})
endif( )
- # display info
- #MESSAGE( STATUS Java version ${Java_VERSION_STRING} configured
successfully! ) # keep me, used for debug
- IF(NOT Java_FIND_QUIETLY)
-MESSAGE( STATUS Java version ${Java_VERSION} configured
successfully! )
- ENDIF(NOT Java_FIND_QUIETLY)
ENDIF()
ENDIF(Java_JAVA_EXECUTABLE)
---
Summary of changes:
Modules/FindJava.cmake|5 -
Source/kwsys/kwsysDateStamp.cmake |2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.5-1420-g09c6832
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, next has been updated via 09c68325ec9d68c4c4de366d524dba0dd027a742 (commit) via 74e1156bc292f45dd376d6324fbf13aa2de539b7 (commit) from 1e6de14cda9a14dedfcaeb05d399e39f7b3e59e7 (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=09c68325ec9d68c4c4de366d524dba0dd027a742 commit 09c68325ec9d68c4c4de366d524dba0dd027a742 Merge: 1e6de14 74e1156 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Aug 3 14:50:31 2011 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Aug 3 14:50:31 2011 -0400 Merge branch 'master' into next --- Summary of changes: Source/kwsys/SystemTools.cxx| 73 -- Source/kwsys/SystemTools.hxx.in |8 + 2 files changed, 17 insertions(+), 64 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.5-1423-g68f4277
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, next has been updated
via 68f42779d377e5e6a11c386d12c0de20ce904777 (commit)
via 6899e58fa0d819638aa5de1408721b718d3299b8 (commit)
via fe6bb7af2aef536d29593f1da8ae4dd19b195e88 (commit)
from 09c68325ec9d68c4c4de366d524dba0dd027a742 (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=68f42779d377e5e6a11c386d12c0de20ce904777
commit 68f42779d377e5e6a11c386d12c0de20ce904777
Merge: 09c6832 6899e58
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Wed Aug 3 16:36:25 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 3 16:36:25 2011 -0400
Merge topic 'FindX11ImprovementsFromKDE' into next
6899e58 Also search for libxkbfile, XSync and SM include dir
fe6bb7a Remove trailing whitespace
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6899e58fa0d819638aa5de1408721b718d3299b8
commit 6899e58fa0d819638aa5de1408721b718d3299b8
Author: Alex Neundorf neund...@kde.org
AuthorDate: Wed Aug 3 22:33:18 2011 +0200
Commit: Alex Neundorf neund...@kde.org
CommitDate: Wed Aug 3 22:33:18 2011 +0200
Also search for libxkbfile, XSync and SM include dir
Alex
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 29f2be5..9df3f01 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -6,6 +6,7 @@
#
# and also the following more fine grained variables:
# Include paths: X11_ICE_INCLUDE_PATH, X11_ICE_LIB,
X11_ICE_FOUND
+#X11_SM_INCLUDE_PATH, X11_SM_LIB,
X11_SM_FOUND
#X11_X11_INCLUDE_PATH, X11_X11_LIB
#X11_Xaccessrules_INCLUDE_PATH,
X11_Xaccess_FOUND
#X11_Xaccessstr_INCLUDE_PATH,
X11_Xaccess_FOUND
@@ -27,6 +28,7 @@
#X11_Xinput_INCLUDE_PATH, X11_Xinput_LIB,
X11_Xinput_FOUND
#X11_Xkb_INCLUDE_PATH,
X11_Xkb_FOUND
#X11_Xkblib_INCLUDE_PATH,
X11_Xkb_FOUND
+#X11_Xkbfile_INCLUDE_PATH, X11_Xkbfile_LIB,
X11_Xkbfile_FOUND
#X11_Xpm_INCLUDE_PATH, X11_Xpm_LIB,
X11_Xpm_FOUND
#X11_XTest_INCLUDE_PATH,X11_XTest_LIB,
X11_XTest_FOUND
#X11_Xrandr_INCLUDE_PATH, X11_Xrandr_LIB,
X11_Xrandr_FOUND
@@ -35,6 +37,8 @@
#X11_Xt_INCLUDE_PATH, X11_Xt_LIB,
X11_Xt_FOUND
#X11_Xutil_INCLUDE_PATH,
X11_Xutil_FOUND
#X11_Xv_INCLUDE_PATH, X11_Xv_LIB,
X11_Xv_FOUND
+#X11_XSync_INCLUDE_PATH,(in X11_Xext_LIB),
X11_XSync_FOUND
+
#=
# Copyright 2001-2009 Kitware, Inc.
@@ -80,6 +84,7 @@ IF (UNIX)
# Solaris lacks XKBrules.h, so we should skip kxkbd there.
FIND_PATH(X11_ICE_INCLUDE_PATH X11/ICE/ICE.h
${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_SM_INCLUDE_PATH X11/SM/SM.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h
${X11_INC_SEARCH_PATH})
@@ -97,6 +102,7 @@ IF (UNIX)
FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h
${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_Xkbfile_INCLUDE_PATH X11/extensions/XKBfile.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h
${X11_INC_SEARCH_PATH})
@@ -107,6 +113,7 @@ IF (UNIX)
FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h
${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xv_INCLUDE_PATH X11/extensions/Xvlib.h
${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_XSync_INCLUDE_PATH X11/extensions/sync.h
${X11_INC_SEARCH_PATH})
FIND_LIBRARY(X11_X11_LIB X11
[Cmake-commits] CMake branch, next, updated. v2.8.5-1425-g37f7336
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, next has been updated
via 37f733655d38bae199003a9b7f7d70d5ea69162b (commit)
via 3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153 (commit)
from 68f42779d377e5e6a11c386d12c0de20ce904777 (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=37f733655d38bae199003a9b7f7d70d5ea69162b
commit 37f733655d38bae199003a9b7f7d70d5ea69162b
Merge: 68f4277 3c53fbb
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Aug 3 17:34:53 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 3 17:34:53 2011 -0400
Merge topic 'intel_fortran_vs2010' into next
3c53fbb Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and
test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153
commit 3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Aug 3 17:24:43 2011 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Wed Aug 3 17:24:43 2011 -0400
Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
For custom commands in VS2010 Fortran projects the INTDIR variable
is different than in the rest of the solution because Intel
fortran still uses the old VS project files even in VS2010. So,
we replace $(Configuration) directly in the project files. I have also
added a FortranOnly test that tests this feature and is run on any
generator that has Fortran abilities.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 7a62b9c..d254164 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1622,6 +1622,10 @@ WriteCustomRule(std::ostream fout,
}
std::string script = this-ConstructScript(command, i-c_str());
+if(this-FortranProject)
+ {
+ cmSystemTools::ReplaceString(script, $(Configuration), i-c_str());
+ }
fout \t\t\t\t\tTool\n
\t\t\t\t\tName=\ customTool \\n
\t\t\t\t\tDescription=\
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index d710405..183399f 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1563,6 +1563,13 @@ void
cmVisualStudio10TargetGenerator::WriteProjectReferences()
i != depends.end(); ++i)
{
cmTarget* dt = *i;
+// skip fortran targets as they can not be processed by MSBuild
+// the only reference will be in the .sln file
+if(static_castcmGlobalVisualStudioGenerator*(this-GlobalGenerator)
+ -TargetIsFortranOnly(*dt))
+ {
+ continue;
+ }
this-WriteString(ProjectReference Include=\, 2);
cmMakefile* mf = dt-GetMakefile();
std::string name = dt-GetName();
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2ad9a77..da4eda0 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -16,6 +16,8 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/${dir})
ENDMACRO(ADD_TEST_MACRO)
+INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CheckFortran.cmake)
+
# Fake a user home directory to avoid polluting the real one.
IF(DEFINED ENV{HOME} AND NOT CTEST_NO_TEST_HOME)
SET(TEST_HOME ${CMake_BINARY_DIR}/Tests/CMakeFiles/TestHome)
@@ -155,6 +157,9 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
SET_TESTS_PROPERTIES(MissingSourceFile PROPERTIES
PASS_REGULAR_EXPRESSION CMake Error at CMakeLists.txt:3
\\(add_executable\\):[ \r\n]*Cannot find source file:[
\r\n]*DoesNotExist/MissingSourceFile.c)
+ IF(CMAKE_Fortran_COMPILER)
+ADD_TEST_MACRO(FortranOnly FortranOnly)
+ ENDIF()
ADD_TEST_MACRO(COnly COnly)
ADD_TEST_MACRO(CxxOnly CxxOnly)
ADD_TEST_MACRO(IPO COnly/COnly)
@@ -1879,7 +1884,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
# fortran does not work for IDE builds because
# CMAKE_STANDARD_LIBRARIES needs to be per language
IF(CMAKE_TEST_GENERATOR MATCHES Make|KDevelop)
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CheckFortran.cmake)
IF(CMAKE_Fortran_COMPILER)
ADD_TEST(Fortran ${CMAKE_CTEST_COMMAND}
--build-and-test
diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt
new file mode 100644
index 000..3c4f0e7
--- /dev/null
+++ b/Tests/FortranOnly/CMakeLists.txt
@@ -0,0 +1,42 @@
+cmake_minimum_required (VERSION 2.8)
+project(FortranOnly Fortran)
+message(CTEST_FULL_OUTPUT
[Cmake-commits] CMake branch, next, updated. v2.8.5-1427-g5b33b48
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, next has been updated
via 5b33b48429b24279150e35e6ce2a632616b46ad8 (commit)
via 91704ef2dee3ad606a6cc0f1e03e6f254d211b8f (commit)
from 37f733655d38bae199003a9b7f7d70d5ea69162b (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=5b33b48429b24279150e35e6ce2a632616b46ad8
commit 5b33b48429b24279150e35e6ce2a632616b46ad8
Merge: 37f7336 91704ef
Author: David Cole david.c...@kitware.com
AuthorDate: Wed Aug 3 21:43:20 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 3 21:43:20 2011 -0400
Merge topic 'add-kwstyle-test' into next
91704ef Tests: Add a KWStyle test, equivalent to the make StyleCheck target
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91704ef2dee3ad606a6cc0f1e03e6f254d211b8f
commit 91704ef2dee3ad606a6cc0f1e03e6f254d211b8f
Author: David Cole david.c...@kitware.com
AuthorDate: Wed Aug 3 21:37:01 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Wed Aug 3 21:37:01 2011 -0400
Tests: Add a KWStyle test, equivalent to the make StyleCheck target
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4bf83b7..ee38fd0 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2073,6 +2073,19 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
--test-command IncludeDirectories)
LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/IncludeDirectories)
+ IF(CMAKE_USE_KWSTYLE AND KWSTYLE_EXECUTABLE)
+# The make StyleCheck command line as a test. If the test fails, look
+# for lines like Error #0 (624) Line length exceed 88 (max=79) in the
+# output to find where the style errors are...
+ADD_TEST(KWStyle ${KWSTYLE_EXECUTABLE}
+ -xml ${CMake_BINARY_DIR}/CMake.kws.xml
+ -o ${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt
+ -v
+ -D ${CMake_BINARY_DIR}/CMakeKWSFiles.txt
+ )
+SET_TESTS_PROPERTIES(KWStyle PROPERTIES
+ WORKING_DIRECTORY ${CMake_BINARY_DIR}/Utilities/KWStyle)
+ ENDIF()
ENDIF(BUILD_TESTING)
SUBDIRS(CMakeTests)
---
Summary of changes:
Tests/CMakeLists.txt | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
