[Cmake-commits] CMake branch, master, updated. v2.8.7-145-g86c9604
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 86c9604f98b2271401cf7a53c251be51af15278c (commit) from 3be1282fd31e7f663b4fdd6a271781cceccbdbda (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=86c9604f98b2271401cf7a53c251be51af15278c commit 86c9604f98b2271401cf7a53c251be51af15278c Author: KWSys Robot AuthorDate: Mon Jan 23 00:05:11 2012 -0500 Commit: KWSys Robot CommitDate: Mon Jan 23 00:05:11 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index d378136..0ce4f2c 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 01) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 22) +SET(KWSYS_DATE_STAMP_DAY 23) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 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.7-2191-g68e7a89
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 68e7a89ea1c44f53e146e9e9d6e06d6702b0615a (commit)
via 3cab24a9740ad1d35e548629f6dda12e166ef49e (commit)
from 6de2163c895d1ee84e4c49e6895071567d18a4d0 (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=68e7a89ea1c44f53e146e9e9d6e06d6702b0615a
commit 68e7a89ea1c44f53e146e9e9d6e06d6702b0615a
Merge: 6de2163 3cab24a
Author: Eric Noulard
AuthorDate: Sun Jan 22 13:32:08 2012 -0500
Commit: CMake Topic Stage
CommitDate: Sun Jan 22 13:32:08 2012 -0500
Merge topic 'AddTopLevelForComponent' into next
3cab24a CPack Add top level directory in component install for Archive
Generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cab24a9740ad1d35e548629f6dda12e166ef49e
commit 3cab24a9740ad1d35e548629f6dda12e166ef49e
Author: Daniel Nelson
AuthorDate: Fri Jan 13 22:01:53 2012 +0100
Commit: Eric NOULARD
CommitDate: Fri Jan 13 22:01:53 2012 +0100
CPack Add top level directory in component install for Archive Generators
This patch fixes bug #0012129
Signed-off-by: Eric NOULARD
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 0ce5b01..12d1796 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -57,13 +57,20 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
std::string dir = cmSystemTools::GetCurrentWorkingDirectory();
// Change to local toplevel
cmSystemTools::ChangeDirectory(localToplevel.c_str());
+ std::string filePrefix;
+ if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY"))
+{
+filePrefix = this->GetOption("CPACK_PACKAGE_FILE_NAME");
+filePrefix += "/";
+}
std::vector::const_iterator fileIt;
for (fileIt = component->Files.begin(); fileIt != component->Files.end();
++fileIt )
{
+std::string rp = filePrefix + *fileIt;
cmCPackLogger(cmCPackLog::LOG_DEBUG,"Adding file: "
- << (*fileIt) << std::endl);
-archive.Add(*fileIt);
+ << rp << std::endl);
+archive.Add(rp);
if (!archive)
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "ERROR while packaging files: "
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 083279f..01ed4df 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -691,6 +691,11 @@ int
cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// one install directory for each component.
tempInstallDirectory +=
GetComponentInstallDirNameSuffix(installComponent);
+ if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY"))
+{
+tempInstallDirectory += "/";
+tempInstallDirectory += this->GetOption("CPACK_PACKAGE_FILE_NAME");
+}
}
if (!setDestDir)
---
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.cxx | 11 +--
Source/CPack/cmCPackGenerator.cxx|5 +
2 files changed, 14 insertions(+), 2 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.7-2189-g6de2163
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 6de2163c895d1ee84e4c49e6895071567d18a4d0 (commit)
via 0f7ae05a423716078b64ea341f1e339162ee9f6d (commit)
from b98f87ace9dc047af46e9efa3292302babc0afb0 (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=6de2163c895d1ee84e4c49e6895071567d18a4d0
commit 6de2163c895d1ee84e4c49e6895071567d18a4d0
Merge: b98f87a 0f7ae05
Author: Rolf Eike Beer
AuthorDate: Sun Jan 22 07:10:12 2012 -0500
Commit: CMake Topic Stage
CommitDate: Sun Jan 22 07:10:12 2012 -0500
Merge topic 'improve-findjasper' into next
0f7ae05 FindJasper: support version number
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f7ae05a423716078b64ea341f1e339162ee9f6d
commit 0f7ae05a423716078b64ea341f1e339162ee9f6d
Author: Rolf Eike Beer
AuthorDate: Sun Jan 22 13:09:33 2012 +0100
Commit: Rolf Eike Beer
CommitDate: Sun Jan 22 13:09:33 2012 +0100
FindJasper: support version number
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index 1933875..0de5af5 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -3,11 +3,13 @@
#
# JASPER_FOUND - system has Jasper
# JASPER_INCLUDE_DIR - the Jasper include directory
-# JASPER_LIBRARIES - The libraries needed to use Jasper
+# JASPER_LIBRARIES - the libraries needed to use Jasper
+# JASPER_VERSION_STRING - the version of Jasper found (since CMake 2.8.8)
#=
# Copyright 2006-2009 Kitware, Inc.
# Copyright 2006 Alexander Neundorf
+# Copyright 2012 Rolf Eike Beer
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -34,10 +36,18 @@ IF (NOT JASPER_LIBRARIES)
ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
ENDIF (NOT JASPER_LIBRARIES)
+IF (JASPER_INCLUDE_DIR AND EXISTS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h")
+FILE(STRINGS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h"
jasper_version_str REGEX "^#define[\t ]+JAS_VERSION[\t ]+\".*\".*")
+
+STRING(REGEX REPLACE "^#define[\t ]+JAS_VERSION[\t ]+\"([^\"]+)\".*" "\\1"
JASPER_VERSION_STRING "${jasper_version_str}")
+ENDIF (JASPER_INCLUDE_DIR AND EXISTS
"${JASPER_INCLUDE_DIR}/jasper/jas_config.h")
+
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES
JASPER_INCLUDE_DIR JPEG_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper
+ REQUIRED_VARS JASPER_LIBRARIES
JASPER_INCLUDE_DIR JPEG_LIBRARIES
+ VERSION_VAR JASPER_VERSION_STRING)
IF (JASPER_FOUND)
SET(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} )
---
Summary of changes:
Modules/FindJasper.cmake | 14 --
1 files changed, 12 insertions(+), 2 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.7-2187-gb98f87a
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 b98f87ace9dc047af46e9efa3292302babc0afb0 (commit)
via 9ee14d178b4336e9c69822044f7fb2ea725c33fd (commit)
via 3be1282fd31e7f663b4fdd6a271781cceccbdbda (commit)
from db18163a1dc6151d74027f3be3b12dd58971a40b (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=b98f87ace9dc047af46e9efa3292302babc0afb0
commit b98f87ace9dc047af46e9efa3292302babc0afb0
Merge: db18163 9ee14d1
Author: Rolf Eike Beer
AuthorDate: Sun Jan 22 06:52:42 2012 -0500
Commit: CMake Topic Stage
CommitDate: Sun Jan 22 06:52:42 2012 -0500
Merge topic 'improve-findjasper' into next
9ee14d1 FindJasper: find debug libraries
3be1282 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ee14d178b4336e9c69822044f7fb2ea725c33fd
commit 9ee14d178b4336e9c69822044f7fb2ea725c33fd
Author: Rolf Eike Beer
AuthorDate: Sun Jan 22 11:15:24 2012 +0100
Commit: Rolf Eike Beer
CommitDate: Sun Jan 22 12:51:54 2012 +0100
FindJasper: find debug libraries
diff --git a/Modules/FindJasper.cmake b/Modules/FindJasper.cmake
index bae4c05..1933875 100644
--- a/Modules/FindJasper.cmake
+++ b/Modules/FindJasper.cmake
@@ -19,19 +19,28 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-FIND_PACKAGE(JPEG)
-
FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
-FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
+IF (NOT JASPER_LIBRARIES)
+FIND_PACKAGE(JPEG)
+
+FIND_LIBRARY(JASPER_LIBRARY_RELEASE NAMES jasper libjasper)
+FIND_LIBRARY(JASPER_LIBRARY_DEBUG NAMES japserd jasper libjasper)
+
+IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+SET(JASPER_LIBRARIES optimized "${JASPER_LIBRARY_RELEASE}" debug
"${JASPER_LIBRARY_DEBUG}")
+ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+SET(JASPER_LIBRARIES "${JASPER_LIBRARY_RELEASE}")
+ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+ENDIF (NOT JASPER_LIBRARIES)
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARY
JASPER_INCLUDE_DIR JPEG_LIBRARIES)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES
JASPER_INCLUDE_DIR JPEG_LIBRARIES)
IF (JASPER_FOUND)
- SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} )
+ SET(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} )
ENDIF (JASPER_FOUND)
-MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)
+MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY_RELEASE
JASPER_LIBRARY_DEBUG)
---
Summary of changes:
Modules/FindJasper.cmake | 21 +++--
Source/kwsys/kwsysDateStamp.cmake |2 +-
2 files changed, 16 insertions(+), 7 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.7-2184-gdb18163
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 db18163a1dc6151d74027f3be3b12dd58971a40b (commit)
via 54fd9e38bb912b94cf32fecac5028d462f4e659f (commit)
from 2bcb720d9825e5f7f2ff51f3751cabf68f251172 (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=db18163a1dc6151d74027f3be3b12dd58971a40b
commit db18163a1dc6151d74027f3be3b12dd58971a40b
Merge: 2bcb720 54fd9e3
Author: Rolf Eike Beer
AuthorDate: Sun Jan 22 06:16:21 2012 -0500
Commit: CMake Topic Stage
CommitDate: Sun Jan 22 06:16:21 2012 -0500
Merge topic 'uninitialized-var-in-if' into next
54fd9e3 fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54fd9e38bb912b94cf32fecac5028d462f4e659f
commit 54fd9e38bb912b94cf32fecac5028d462f4e659f
Author: Rolf Eike Beer
AuthorDate: Fri Jan 20 18:27:26 2012 +0100
Commit: Rolf Eike Beer
CommitDate: Sun Jan 22 12:15:57 2012 +0100
fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
Also adds test to verify this.
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 22ba28f..4eed477 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -910,6 +910,7 @@ bool cmIfCommand::IsTrue(const std::vector
&args,
if (newArgs.size() != 1)
{
errorString = "Unknown arguments specified";
+status = cmake::FATAL_ERROR;
return false;
}
diff --git a/Tests/CMakeTests/If-Invalid-Argument.cmake
b/Tests/CMakeTests/If-Invalid-Argument.cmake
new file mode 100644
index 000..b4fb97f
--- /dev/null
+++ b/Tests/CMakeTests/If-Invalid-Argument.cmake
@@ -0,0 +1,2 @@
+if (NOT foo bar STREQUAL "foo bar")
+endif()
diff --git a/Tests/CMakeTests/IfTest.cmake.in b/Tests/CMakeTests/IfTest.cmake.in
index e5211b4..639e226 100644
--- a/Tests/CMakeTests/IfTest.cmake.in
+++ b/Tests/CMakeTests/IfTest.cmake.in
@@ -156,3 +156,11 @@ foreach(_bad 2x -2x)
endforeach()
test_vars("")
+
+set(Invalid-Argument-RESULT 1)
+set(Invalid-Argument-STDERR ".*CMake Error at
(@CMAKE_CURRENT_SOURCE_DIR@/)?If-Invalid-Argument.cmake:1 \\(if\\):.*Unknown
arguments specified.*")
+
+include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake")
+check_cmake_test(If
+ Invalid-Argument
+)
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
