[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-66-g53d7c92
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 53d7c926741f54e8d556ffe3f0b415625e1f5293 (commit) via 2e3c67d1b636f752eea35ef407c5243a79742d63 (commit) from cd496d077c10648bb0aecd7bde539c624346a137 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d7c926741f54e8d556ffe3f0b415625e1f5293 commit 53d7c926741f54e8d556ffe3f0b415625e1f5293 Merge: cd496d0 2e3c67d Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Jun 3 16:42:35 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jun 3 16:42:35 2016 -0400 Merge topic 'productbuild' into next 2e3c67d1 productbuild: Add new productbuild cpack generator. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e3c67d1b636f752eea35ef407c5243a79742d63 commit 2e3c67d1b636f752eea35ef407c5243a79742d63 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Sat Nov 2 10:24:53 2013 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Fri Jun 3 14:41:57 2016 -0600 productbuild: Add new productbuild cpack generator. This cpack generator basically replaces the obsolete PackageMaker generator. diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 62910cf..f911662 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -60,6 +60,7 @@ All Modules /module/CPackIFW /module/CPackNSIS /module/CPackPackageMaker + /module/CPackProductBuild /module/CPackRPM /module/CPack /module/CPackWIX diff --git a/Help/module/CPackProductBuild.rst b/Help/module/CPackProductBuild.rst new file mode 100644 index 000..6081fe4 --- /dev/null +++ b/Help/module/CPackProductBuild.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/CPackProductBuild.cmake diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 77f854d..4d51a3e 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -455,6 +455,7 @@ if(NOT CPACK_GENERATOR) option(CPACK_BINARY_DRAGNDROP"Enable to build OSX Drag And Drop package" OFF) option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF) option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" OFF) +option(CPACK_BINARY_PRODUCTBUILD "Enable to build productbuild packages" OFF) else() option(CPACK_BINARY_TZ "Enable to build TZ packages" ON) endif() @@ -483,6 +484,7 @@ if(NOT CPACK_GENERATOR) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_NSIS NSIS) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker) + cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PRODUCTBUILD productbuild) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_RPM RPM) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ) cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2) @@ -531,6 +533,7 @@ mark_as_advanced( CPACK_BINARY_NSIS CPACK_BINARY_OSXX11 CPACK_BINARY_PACKAGEMAKER + CPACK_BINARY_PRODUCTBUILD CPACK_BINARY_RPM CPACK_BINARY_STGZ CPACK_BINARY_TBZ2 diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake new file mode 100644 index 000..6545a3a --- /dev/null +++ b/Modules/CPackProductBuild.cmake @@ -0,0 +1,38 @@ +#.rst: +# CPackProductBuild +# - +# +# productbuild CPack generator (Mac OS X). +# +# Variables specific to CPack productbuild generator +# ^^ +# +# The following variable is specific to installers built on Mac +# OS X using productbuild: +# +# .. variable:: CPACK_COMMAND_PRODUCTBUILD +# +# Path to the productbuild(1) command used to generate a product archive for +# the OS X Installer or Mac App Store. This variable can be used to override +# the automatically detected command (or specify its location if the +# auto-detection fails to find it.) +# +# .. variable:: CPACK_COMMAND_PKGBUILD +# +# Path to the pkgbuild(1) command used to generate an OS X component package +# on OS X. This variable can be used to override the automatically detected +# command (or specify its location if the auto-detection fails to find it.) +# + +#= +# Copyright 2006-2012 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# s
[Cmake-commits] CMake branch, next, updated. v3.5.2-878-gc832015
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 c832015679e14bfa943cf9c1229aacaf19263b71 (commit)
via a9e9f67a466bbcb59f06b4792ff920ac59b6181e (commit)
from b7fa61ce446cd8c7ae20722761c9055698e2b812 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c832015679e14bfa943cf9c1229aacaf19263b71
commit c832015679e14bfa943cf9c1229aacaf19263b71
Merge: b7fa61c a9e9f67
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Fri Jun 3 14:16:34 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jun 3 14:16:34 2016 -0400
Merge topic 'productbuild' into next
a9e9f67a productbuild: add some documentation.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9e9f67a466bbcb59f06b4792ff920ac59b6181e
commit a9e9f67a466bbcb59f06b4792ff920ac59b6181e
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Fri Jun 3 12:12:26 2016 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Fri Jun 3 12:13:08 2016 -0600
productbuild: add some documentation.
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 62910cf..f911662 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -60,6 +60,7 @@ All Modules
/module/CPackIFW
/module/CPackNSIS
/module/CPackPackageMaker
+ /module/CPackProductBuild
/module/CPackRPM
/module/CPack
/module/CPackWIX
diff --git a/Help/module/CPackProductBuild.rst
b/Help/module/CPackProductBuild.rst
new file mode 100644
index 000..de55448
--- /dev/null
+++ b/Help/module/CPackProductBuild.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CPackPackageMaker.cmake
diff --git a/Modules/CPackProductBuild.cmake b/Modules/CPackProductBuild.cmake
new file mode 100644
index 000..6545a3a
--- /dev/null
+++ b/Modules/CPackProductBuild.cmake
@@ -0,0 +1,38 @@
+#.rst:
+# CPackProductBuild
+# -
+#
+# productbuild CPack generator (Mac OS X).
+#
+# Variables specific to CPack productbuild generator
+# ^^
+#
+# The following variable is specific to installers built on Mac
+# OS X using productbuild:
+#
+# .. variable:: CPACK_COMMAND_PRODUCTBUILD
+#
+# Path to the productbuild(1) command used to generate a product archive for
+# the OS X Installer or Mac App Store. This variable can be used to override
+# the automatically detected command (or specify its location if the
+# auto-detection fails to find it.)
+#
+# .. variable:: CPACK_COMMAND_PKGBUILD
+#
+# Path to the pkgbuild(1) command used to generate an OS X component package
+# on OS X. This variable can be used to override the automatically detected
+# command (or specify its location if the auto-detection fails to find it.)
+#
+
+#=
+# Copyright 2006-2012 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
---
Summary of changes:
Help/manual/cmake-modules.7.rst|1 +
...CPackPackageMaker.rst => CPackProductBuild.rst} |0
Modules/CPackProductBuild.cmake| 38
3 files changed, 39 insertions(+)
copy Help/module/{CPackPackageMaker.rst => CPackProductBuild.rst} (100%)
create mode 100644 Modules/CPackProductBuild.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.2-852-g328b91e
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 328b91e76b5ac6cfc45ca601e6cd03c216a7df9e (commit)
via e2d3d7558cbeb3db7e48bbb9c9dda1f503622b34 (commit)
from aac033f37386fbb263279cbe76349d69697b671d (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=328b91e76b5ac6cfc45ca601e6cd03c216a7df9e
commit 328b91e76b5ac6cfc45ca601e6cd03c216a7df9e
Merge: aac033f e2d3d75
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 14:55:24 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 2 14:55:24 2016 -0400
Merge topic 'productbuild' into next
e2d3d755 productbuild: only enable productbuild tests on new enough Xcode
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d3d7558cbeb3db7e48bbb9c9dda1f503622b34
commit e2d3d7558cbeb3db7e48bbb9c9dda1f503622b34
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 12:55:04 2016 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Jun 2 12:55:04 2016 -0600
productbuild: only enable productbuild tests on new enough Xcode
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 63d494f..bffa4b7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -951,8 +951,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
set(CPackComponents_BUILD_OPTIONS)
if(APPLE)
set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
- set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
--DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+ if(CMake_TEST_XCODE_VERSION VERSION_GREATER "4.6")
+set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
+ -DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+ endif()
endif()
if(NSIS_MAKENSIS_EXECUTABLE)
set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
@@ -997,7 +999,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
list(APPEND ACTIVE_CPACK_GENERATORS "ZIP")
if(APPLE)
list(APPEND ACTIVE_CPACK_GENERATORS "DragNDrop")
- list(APPEND ACTIVE_CPACK_GENERATORS "productbuild")
+ if(CMake_TEST_XCODE_VERSION VERSION_GREATER "4.6")
+list(APPEND ACTIVE_CPACK_GENERATORS "productbuild")
+ endif()
endif()
# set up list of component packaging ways
@@ -1108,8 +1112,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
set(CPackComponents_BUILD_OPTIONS)
if(APPLE)
set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
- set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
--DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+ if(CMake_TEST_XCODE_VERSION VERSION_GREATER "4.6")
+set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
+ -DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+ endif()
endif()
if(NOT NSIS_MAKENSIS_EXECUTABLE)
set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
---
Summary of changes:
Tests/CMakeLists.txt | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.2-846-g7eea22d
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 7eea22de2d9b5055601dea903293b49ee6962e86 (commit)
via 119b0d9795267a83aeb8902aa103750778d427a0 (commit)
from b746bd5c9941cf4747fedd4822ea9660d10a00c5 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eea22de2d9b5055601dea903293b49ee6962e86
commit 7eea22de2d9b5055601dea903293b49ee6962e86
Merge: b746bd5 119b0d9
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 12:13:09 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 2 12:13:09 2016 -0400
Merge topic 'productbuild' into next
119b0d97 productbuild: fix style and compile warnings
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=119b0d9795267a83aeb8902aa103750778d427a0
commit 119b0d9795267a83aeb8902aa103750778d427a0
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 10:05:43 2016 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Jun 2 10:12:43 2016 -0600
productbuild: fix style and compile warnings
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx
b/Source/CPack/cmCPackProductBuildGenerator.cxx
index 44adccd..c1f63cc 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@@ -98,14 +98,15 @@ int cmCPackProductBuildGenerator::PackageFiles()
std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
pkgCmd << productbuild
- << " --distribution \"" << packageDirFileName <<
"/Contents/distribution.dist\""
+ << " --distribution \"" << packageDirFileName
+<< "/Contents/distribution.dist\""
<< " --package-path \"" << packageDirFileName << "/Contents/Packages" << "\""
<< " --resources \"" << resDir << "\""
<< " --version \"" << version << "\""
<< " \"" << packageFileNames[0] << "\"";
// Run ProductBuild
- return RunProductBuild(pkgCmd.str(), packageFileNames[0]);
+ return RunProductBuild(pkgCmd.str());
}
int cmCPackProductBuildGenerator::InitializeInternal()
@@ -135,17 +136,17 @@ int cmCPackProductBuildGenerator::InitializeInternal()
}
-bool cmCPackProductBuildGenerator::RunProductBuild(const std::string& command,
- const std::string&
packageFile)
+bool cmCPackProductBuildGenerator::RunProductBuild(
+ const std::string& command)
{
std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
tmpFile += "/ProductBuildOutput.log";
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << command << std::endl);
- std::string output, stderr;
+ std::string output, error_output;
int retVal = 1;
- bool res = cmSystemTools::RunSingleCommand(command.c_str(), ,
, , 0,
- this->GeneratorVerbose, 0);
+ bool res = cmSystemTools::RunSingleCommand(command.c_str(),
+, _output, , 0, this->GeneratorVerbose, 0);
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Done running command"
<< std::endl);
if ( !res || retVal )
@@ -240,11 +241,12 @@ bool
cmCPackProductBuildGenerator::GenerateComponentPackage(
<< " \"" << packageFile << "\"";
// Run ProductBuild
- return RunProductBuild(pkgCmd.str(), packageFile);
+ return RunProductBuild(pkgCmd.str());
}
-const char* cmCPackProductBuildGenerator::GetComponentScript(const char*
script,
- const char*
component_name)
+const char* cmCPackProductBuildGenerator::GetComponentScript(
+ const char* script,
+ const char* component_name)
{
std::string scriptname = std::string("CPACK_") + script + "_";
if(component_name)
diff --git a/Source/CPack/cmCPackProductBuildGenerator.h
b/Source/CPack/cmCPackProductBuildGenerator.h
index 9cc9653..0740f89 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.h
+++ b/Source/CPack/cmCPackProductBuildGenerator.h
@@ -41,7 +41,7 @@ protected:
// Run ProductBuild with the given command line, which will (if
// successful) produce the given package file. Returns true if
// ProductBuild succeeds, fal
[Cmake-commits] CMake branch, next, updated. v3.5.2-844-gb746bd5
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 b746bd5c9941cf4747fedd4822ea9660d10a00c5 (commit)
via 09bb6f89aa3c7f2b5dfcc52bd0d59f97c28503eb (commit)
via 50a3d34005ec923db3d76d0a5d118437a7632617 (commit)
from 68e77a5f3048019731b59e91b1e303f7a13f83a7 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b746bd5c9941cf4747fedd4822ea9660d10a00c5
commit b746bd5c9941cf4747fedd4822ea9660d10a00c5
Merge: 68e77a5 09bb6f8
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 11:52:36 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 2 11:52:36 2016 -0400
Merge topic 'productbuild' into next
09bb6f89 productbuild: Add new productbuild cpack generator.
50a3d340 PackageMaker: factor out common code for creating pkg files.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09bb6f89aa3c7f2b5dfcc52bd0d59f97c28503eb
commit 09bb6f89aa3c7f2b5dfcc52bd0d59f97c28503eb
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Sat Nov 2 10:24:53 2013 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Wed Jun 1 21:56:54 2016 -0600
productbuild: Add new productbuild cpack generator.
This cpack generator basically replaces the obsolete PackageMaker generator.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 77f854d..4d51a3e 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -455,6 +455,7 @@ if(NOT CPACK_GENERATOR)
option(CPACK_BINARY_DRAGNDROP"Enable to build OSX Drag And Drop
package" OFF)
option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages"
OFF)
option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker
packages" OFF)
+option(CPACK_BINARY_PRODUCTBUILD "Enable to build productbuild
packages" OFF)
else()
option(CPACK_BINARY_TZ "Enable to build TZ packages" ON)
endif()
@@ -483,6 +484,7 @@ if(NOT CPACK_GENERATOR)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_NSIS NSIS)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER
PackageMaker)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PRODUCTBUILD
productbuild)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_RPM RPM)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2)
@@ -531,6 +533,7 @@ mark_as_advanced(
CPACK_BINARY_NSIS
CPACK_BINARY_OSXX11
CPACK_BINARY_PACKAGEMAKER
+ CPACK_BINARY_PRODUCTBUILD
CPACK_BINARY_RPM
CPACK_BINARY_STGZ
CPACK_BINARY_TBZ2
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f85f143..7cf11ca 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -719,6 +719,7 @@ if(APPLE)
CPack/cmCPackOSXX11Generator.cxx
CPack/cmCPackPKGGenerator.cxx
CPack/cmCPackPackageMakerGenerator.cxx
+CPack/cmCPackProductBuildGenerator.cxx
)
endif()
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx
b/Source/CPack/cmCPackGeneratorFactory.cxx
index b17f52e..cf072bb 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -28,6 +28,7 @@
#include "cmCPackDragNDropGenerator.h"
#include "cmCPackOSXX11Generator.h"
#include "cmCPackPackageMakerGenerator.h"
+#include "cmCPackProductBuildGenerator.h"
#endif
#ifdef __CYGWIN__
@@ -122,6 +123,10 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
this->RegisterGenerator("OSXX11", "Mac OSX X11 bundle",
cmCPackOSXX11Generator::CreateGenerator);
}
+ if (cmCPackProductBuildGenerator::CanGenerate()) {
+this->RegisterGenerator("productbuild", "Mac OSX pkg",
+ cmCPackProductBuildGenerator::CreateGenerator);
+ }
#endif
#if !defined(_WIN32) && !defined(__QNXNTO__) && !defined(__BEOS__) && \
!defined(__HAIKU__)
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx
b/Source/CPack/cmCPackPKGGenerator.cxx
index 8282714..ff0fa8c 100644
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@ -41,7 +41,6 @@ int cmCPackPKGGenerator::InitializeInternal()
{
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"cmCPackPKGGenerator::Initialize()" << s
[Cmake-commits] CMake branch, next, updated. v3.5.2-1334-g824fa31
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 824fa316be79bc424901f35176df3eaa087bc4df (commit)
via 97775975d544b60aeb3810a07387fd11d229dfaa (commit)
from 3f9a01c14cd232c8d1a3ecf552b42df131bbdd6e (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=824fa316be79bc424901f35176df3eaa087bc4df
commit 824fa316be79bc424901f35176df3eaa087bc4df
Merge: 3f9a01c 9777597
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed May 11 14:52:32 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed May 11 14:52:32 2016 -0400
Merge topic 'cmake-gui-locale' into next
97775975 cmake-gui: set LC_NUMERIC = "C" at startup.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97775975d544b60aeb3810a07387fd11d229dfaa
commit 97775975d544b60aeb3810a07387fd11d229dfaa
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed May 11 12:51:32 2016 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Wed May 11 12:51:32 2016 -0600
cmake-gui: set LC_NUMERIC = "C" at startup.
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index b78a5df..1e1f040 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -94,6 +94,8 @@ int main(int argc, char** argv)
QApplication app(argc, argv);
+ setlocale(LC_NUMERIC, "C");
+
#if defined(CMAKE_ENCODING_UTF8)
QTextCodec* utf8_codec = QTextCodec::codecForName("UTF-8");
QTextCodec::setCodecForLocale(utf8_codec);
---
Summary of changes:
Source/QtDialog/CMakeSetup.cxx |2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-317-gc3f20a8
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 c3f20a8861467bdf85322b184cf060c822d3b2c8 (commit)
via 53dbbaa907131c3302a037c3c8d2c1ca5eb19027 (commit)
from cc20b98859ecfaafe607d2bc2075ef71dde4a07d (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3f20a8861467bdf85322b184cf060c822d3b2c8
commit c3f20a8861467bdf85322b184cf060c822d3b2c8
Merge: cc20b98 53dbbaa
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Mar 1 17:54:59 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 1 17:54:59 2016 -0500
Merge topic 'bundle-utils-logic-fix' into next
53dbbaa9 BundleUtilities: Fix regression handling frameworks.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53dbbaa907131c3302a037c3c8d2c1ca5eb19027
commit 53dbbaa907131c3302a037c3c8d2c1ca5eb19027
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Mar 1 15:48:14 2016 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Mar 1 15:52:33 2016 -0700
BundleUtilities: Fix regression handling frameworks.
Fix logic error introduced in e422f738.
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 73ff0af..4b52afa 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -479,7 +479,7 @@ function(set_bundle_key_values keys_var context item
exepath dirs copyflag)
get_item_rpaths("${resolved_item}" item_rpaths)
-if((item NOT MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/"))
+if((NOT item MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/"))
# For frameworks, construct the name under the embedded path from the
# opening "${item_name}.framework/" to the closing "/${item_name}":
#
---
Summary of changes:
Modules/BundleUtilities.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.2-2025-gbde6c55
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 bde6c5547e181b72aaefba092bdd9a79ba01 (commit)
via a15e375cddb415ebe89aa5896d783b821aca940c (commit)
from 683f5b178974acfe2d387e2ab0a4040ed023b51e (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bde6c5547e181b72aaefba092bdd9a79ba01
commit bde6c5547e181b72aaefba092bdd9a79ba01
Merge: 683f5b1 a15e375
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Jan 19 16:06:07 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 19 16:06:07 2016 -0500
Merge topic 'mfc-utility-targets' into next
a15e375c Fix MFC setting on utility targets (#15867)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a15e375cddb415ebe89aa5896d783b821aca940c
commit a15e375cddb415ebe89aa5896d783b821aca940c
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Jan 19 14:01:08 2016 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Jan 19 14:04:15 2016 -0700
Fix MFC setting on utility targets (#15867)
Multi-byte MFC is deprecated, and some projects will not compile if MFC is
enabled.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 27ae685..09d4a90 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -762,13 +762,16 @@ void cmVisualStudio10TargetGenerator
std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
std::string useOfMfcValue = "false";
- if(mfcFlagValue == "1")
-{
-useOfMfcValue = "Static";
-}
- else if(mfcFlagValue == "2")
+ if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
{
-useOfMfcValue = "Dynamic";
+if(mfcFlagValue == "1")
+ {
+ useOfMfcValue = "Static";
+ }
+else if(mfcFlagValue == "2")
+ {
+ useOfMfcValue = "Dynamic";
+ }
}
std::string mfcLine = "";
mfcLine += useOfMfcValue + "\n";
---
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1203-g63966e1
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 63966e13c4b02f45a02b6a308b7d9bb70ca77efe (commit) via f8eb72fe5fedbf45e66f433e6bc54e1cf0359760 (commit) from acd292f497cb88d2212be5fe0752dadb05bc9c2a (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63966e13c4b02f45a02b6a308b7d9bb70ca77efe commit 63966e13c4b02f45a02b6a308b7d9bb70ca77efe Merge: acd292f f8eb72f Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Nov 2 08:49:12 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Nov 2 08:49:12 2015 -0500 Merge topic 'macosx_rpath-clarify-doc' into next f8eb72fe Help: Clarify documentation for MACOSX_RPATH variable. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8eb72fe5fedbf45e66f433e6bc54e1cf0359760 commit f8eb72fe5fedbf45e66f433e6bc54e1cf0359760 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Nov 2 06:46:02 2015 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Mon Nov 2 06:46:02 2015 -0700 Help: Clarify documentation for MACOSX_RPATH variable. diff --git a/Help/prop_tgt/MACOSX_RPATH.rst b/Help/prop_tgt/MACOSX_RPATH.rst index d3934ba..1c503d1 100644 --- a/Help/prop_tgt/MACOSX_RPATH.rst +++ b/Help/prop_tgt/MACOSX_RPATH.rst @@ -1,17 +1,22 @@ MACOSX_RPATH -Whether to use rpaths on Mac OS X. +Whether this target on Mac OS X is located at runtime using rpaths. When this property is set to true, the directory portion of -the "install_name" field of shared libraries will be ``@rpath`` -unless overridden by :prop_tgt:`INSTALL_NAME_DIR`. Runtime -paths will also be embedded in binaries using this target and -can be controlled by the :prop_tgt:`INSTALL_RPATH` target property. +the "install_name" field of this shared library will be ``@rpath`` +unless overridden by :prop_tgt:`INSTALL_NAME_DIR`. This indicates +the shared library is to be found at runtime using runtime +paths (rpaths). + This property is initialized by the value of the variable :variable:`CMAKE_MACOSX_RPATH` if it is set when a target is created. +Runtime paths will also be embedded in binaries using this target and +can be controlled by the :prop_tgt:`INSTALL_RPATH` target property on +the target linking to this target. + Policy CMP0042 was introduced to change the default value of MACOSX_RPATH to ON. This is because use of ``@rpath`` is a more flexible and powerful alternative to ``@executable_path`` and --- Summary of changes: Help/prop_tgt/MACOSX_RPATH.rst | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.1-3038-gcf6b25f
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 cf6b25fc0bcb78685da62991190eaa3ef910 (commit)
via 851915a58c664d813ae62bbe56b2a14435b2df08 (commit)
from de4a71d2fb812d6a33e97163ef1523c6b1527c47 (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=cf6b25fc0bcb78685da62991190eaa3ef910
commit cf6b25fc0bcb78685da62991190eaa3ef910
Merge: de4a71d 851915a
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Sep 17 10:33:47 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 17 10:33:47 2015 -0400
Merge topic 'cmake-gui-qt5-package' into next
851915a5 cmake-gui: Improve packaging of Qt5 libraries.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=851915a58c664d813ae62bbe56b2a14435b2df08
commit 851915a58c664d813ae62bbe56b2a14435b2df08
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Sep 17 07:21:53 2015 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Sep 17 08:32:51 2015 -0600
cmake-gui: Improve packaging of Qt5 libraries.
Fixes #15685, where the right Qt5 dlls on Windows were not packaged because
they were not found when relying on the PATH environment variable.
Also some cleanup of code introduced in 8120e13f, but no longer needed with
678aaad1.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index ad6a7fb..570b537 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -78,9 +78,12 @@ if (Qt5Widgets_FOUND)
endif()
endif()
- if(WIN32 AND TARGET Qt5::Core)
+ if(TARGET Qt5::Core)
get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
+if(APPLE)
+ get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
+endif()
endif()
else()
set(QT_MIN_VERSION "4.4.0")
@@ -94,12 +97,6 @@ else()
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
- if(WIN32 AND EXISTS "${QT_QMAKE_EXECUTABLE}")
-get_filename_component(_Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
-if(EXISTS "${_Qt_BIN_DIR}/QtCore4.dll")
- set(Qt_BIN_DIR ${_Qt_BIN_DIR})
-endif()
- endif()
endif()
set(SRCS
@@ -157,9 +154,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY}
${CMake_QT_LIBRARIES})
-if(Qt_BIN_DIR)
- set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
-endif()
if(APPLE)
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
@@ -223,7 +217,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
install(CODE "
include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
set(BU_CHMOD_BUNDLE_ITEMS ON)
-fixup_bundle(\"${fixup_exe}\" \"${QT_PLUGINS}\"
\"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
+fixup_bundle(\"${fixup_exe}\" \"${QT_PLUGINS}\"
\"${Qt_BIN_DIR};${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
" ${COMPONENT})
endif()
---
Summary of changes:
Source/QtDialog/CMakeLists.txt | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-2240-g61a0fe4
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 61a0fe4648d7e2c65c1fb62641f6c6e3dea2afb3 (commit)
via e06ea8373f434fa581cc7c88366fa483b741aebd (commit)
from 2d83690fe2c785b5cda0fb6c0822b879071a649d (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=61a0fe4648d7e2c65c1fb62641f6c6e3dea2afb3
commit 61a0fe4648d7e2c65c1fb62641f6c6e3dea2afb3
Merge: 2d83690 e06ea83
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Aug 15 01:16:52 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Aug 15 01:16:52 2015 -0400
Merge topic 'extended-length-paths' into next
e06ea837 cmSystemTools: Use extended length paths for Windows apis.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e06ea8373f434fa581cc7c88366fa483b741aebd
commit e06ea8373f434fa581cc7c88366fa483b741aebd
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Aug 14 23:14:06 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Aug 14 23:14:06 2015 -0600
cmSystemTools: Use extended length paths for Windows apis.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2543e68..a117238 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -950,8 +950,9 @@ bool cmSystemTools::RenameFile(const char* oldname, const
char* newname)
Try multiple times since we may be racing against another process
creating/opening the destination file just before our MoveFileEx. */
WindowsFileRetry retry = cmSystemTools::GetWindowsFileRetry();
- while(!MoveFileExW(cmsys::Encoding::ToWide(oldname).c_str(),
- cmsys::Encoding::ToWide(newname).c_str(),
+ while(!MoveFileExW(
+ SystemTools::ConvertToWindowsExtendedPath(oldname).c_str(),
+ SystemTools::ConvertToWindowsExtendedPath(newname).c_str(),
MOVEFILE_REPLACE_EXISTING) --retry.Count)
{
DWORD last_error = GetLastError();
@@ -962,12 +963,14 @@ bool cmSystemTools::RenameFile(const char* oldname, const
char* newname)
return false;
}
DWORD attrs =
- GetFileAttributesW(cmsys::Encoding::ToWide(newname).c_str());
+ GetFileAttributesW(
+SystemTools::ConvertToWindowsExtendedPath(newname).c_str());
if((attrs != INVALID_FILE_ATTRIBUTES)
(attrs FILE_ATTRIBUTE_READONLY))
{
// Remove the read-only attribute from the destination file.
- SetFileAttributesW(cmsys::Encoding::ToWide(newname).c_str(),
+ SetFileAttributesW(
+SystemTools::ConvertToWindowsExtendedPath(newname).c_str(),
attrs ~FILE_ATTRIBUTE_READONLY);
}
else
@@ -1956,11 +1959,11 @@ bool cmSystemTools::CopyFileTime(const char* fromFile,
const char* toFile)
{
#if defined(_WIN32) !defined(__CYGWIN__)
cmSystemToolsWindowsHandle hFrom =
-CreateFileW(cmsys::Encoding::ToWide(fromFile).c_str(),
+CreateFileW(SystemTools::ConvertToWindowsExtendedPath(fromFile).c_str(),
GENERIC_READ, FILE_SHARE_READ, 0,
OPEN_EXISTING, 0, 0);
cmSystemToolsWindowsHandle hTo =
-CreateFileW(cmsys::Encoding::ToWide(toFile).c_str(),
+CreateFileW(SystemTools::ConvertToWindowsExtendedPath(toFile).c_str(),
GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
if(!hFrom || !hTo)
{
@@ -2012,7 +2015,7 @@ bool cmSystemTools::FileTimeGet(const char* fname,
cmSystemToolsFileTime* t)
{
#if defined(_WIN32) !defined(__CYGWIN__)
cmSystemToolsWindowsHandle h =
-CreateFileW(cmsys::Encoding::ToWide(fname).c_str(),
+CreateFileW(SystemTools::ConvertToWindowsExtendedPath(fname).c_str(),
GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
if(!h)
{
@@ -2039,7 +2042,7 @@ bool cmSystemTools::FileTimeSet(const char* fname,
cmSystemToolsFileTime* t)
{
#if defined(_WIN32) !defined(__CYGWIN__)
cmSystemToolsWindowsHandle h =
-CreateFileW(cmsys::Encoding::ToWide(fname).c_str(),
+CreateFileW(SystemTools::ConvertToWindowsExtendedPath(fname).c_str(),
GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
if(!h)
{
---
Summary of changes:
Source/cmSystemTools.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-2238-g2d83690
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 2d83690fe2c785b5cda0fb6c0822b879071a649d (commit)
via ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9 (commit)
from b5cc08fa9acd1678a671b7a4cefaa9c901bb15b7 (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=2d83690fe2c785b5cda0fb6c0822b879071a649d
commit 2d83690fe2c785b5cda0fb6c0822b879071a649d
Merge: b5cc08f ba1065a
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Aug 15 00:59:49 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Aug 15 00:59:49 2015 -0400
Merge topic 'build-subdir' into next
ba1065ab cmake: Add support for --build . in subdirectory (#15696)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9
commit ba1065ab7b3c293245b3bbe733f8f062b9aa7ac9
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Aug 14 22:45:53 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Aug 14 22:46:53 2015 -0600
cmake: Add support for --build . in subdirectory (#15696)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2855329..62b3f83 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2745,6 +2745,25 @@ int cmake::Build(const std::string dir,
}
std::string cachePath = dir;
cmSystemTools::ConvertToUnixSlashes(cachePath);
+ std::string cacheFile = cachePath;
+ cacheFile += /CMakeCache.txt;
+ if(!cmSystemTools::FileExists(cacheFile.c_str()))
+{
+// search in parent directories for cache
+std::string cmakeFiles = cachePath;
+cmakeFiles += /CMakeFiles;
+if(cmSystemTools::FileExists(cmakeFiles.c_str()))
+ {
+ std::string cachePathFound =
+cmSystemTools::FileExistsInParentDirectories(
+ CMakeCache.txt, cachePath.c_str(), /);
+ if(!cachePathFound.empty())
+{
+cachePath = cmSystemTools::GetFilenamePath(cachePathFound);
+}
+ }
+}
+
if(!this-LoadCache(cachePath))
{
std::cerr Error: could not load cache\n;
---
Summary of changes:
Source/cmake.cxx | 19 +++
1 file changed, 19 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1270-geb0b17c
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 eb0b17c2f07271753f202b14a5e52d30f8f5430d (commit)
via 68a1304235442e16d4b230800efd72dbac3c4b26 (commit)
from 460cc0a18df64a920c7ce51eebd64506d31660db (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=eb0b17c2f07271753f202b14a5e52d30f8f5430d
commit eb0b17c2f07271753f202b14a5e52d30f8f5430d
Merge: 460cc0a 68a1304
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Mar 28 00:53:44 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Mar 28 00:53:44 2015 -0400
Merge topic 'cpack-archive-prefix' into next
68a13042 Enable CPack ZIP generator for CPackComponentsPrefix test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68a1304235442e16d4b230800efd72dbac3c4b26
commit 68a1304235442e16d4b230800efd72dbac3c4b26
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 27 22:53:11 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Mar 27 22:53:11 2015 -0600
Enable CPack ZIP generator for CPackComponentsPrefix test.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b47ea1b..f2df4af 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1057,6 +1057,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--build-options ${build_options}
-DCPACK_BINARY_DEB:BOOL=${CPACK_BINARY_DEB}
-DCPACK_BINARY_RPM:BOOL=${CPACK_BINARY_RPM}
+-DCPACK_BINARY_ZIP:BOOL=ON
${CPackComponents_BUILD_OPTIONS}
)
list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/CPackComponentsPrefix)
---
Summary of changes:
Tests/CMakeLists.txt |1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1245-gadfa972
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 adfa97275e880a785d9611a60af9df9591fe4af0 (commit)
via 7fea419624386df1d36688f687725b5624de5db8 (commit)
from f19528014b75129c08d5749239c86b2ceabaa6b7 (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=adfa97275e880a785d9611a60af9df9591fe4af0
commit adfa97275e880a785d9611a60af9df9591fe4af0
Merge: f195280 7fea419
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 27 00:06:11 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 27 00:06:11 2015 -0400
Merge topic 'cpack-archive-prefix' into next
7fea4196 Fix KWStyle test failure.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fea419624386df1d36688f687725b5624de5db8
commit 7fea419624386df1d36688f687725b5624de5db8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 22:05:41 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 26 22:05:41 2015 -0600
Fix KWStyle test failure.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index b42a35e..05b5cd9 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -63,7 +63,8 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
filePrefix = this-GetOption(CPACK_PACKAGE_FILE_NAME);
filePrefix += /;
}
- const char* installPrefix =
this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
+ const char* installPrefix =
+this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
if(installPrefix installPrefix[0] == '/' installPrefix[1] != 0)
{
// add to file prefix and remove the leading '/'
---
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1247-gdf5c75d
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 df5c75d49d76488736841fe6e3bde1f4d85b0ece (commit)
via 798582d0018ee501e0091d4ae1315d3d1b000ca2 (commit)
from adfa97275e880a785d9611a60af9df9591fe4af0 (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=df5c75d49d76488736841fe6e3bde1f4d85b0ece
commit df5c75d49d76488736841fe6e3bde1f4d85b0ece
Merge: adfa972 798582d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 27 00:15:37 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 27 00:15:37 2015 -0400
Merge topic 'cpack-archive-prefix' into next
798582d0 Fix CPackComponentsPrefix test failure without NSIS.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=798582d0018ee501e0091d4ae1315d3d1b000ca2
commit 798582d0018ee501e0091d4ae1315d3d1b000ca2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 22:14:07 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 26 22:14:07 2015 -0600
Fix CPackComponentsPrefix test failure without NSIS.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7135f5d..b47ea1b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1041,9 +1041,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
if(APPLE)
set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
endif()
-if(NSIS_MAKENSIS_EXECUTABLE)
+if(NOT NSIS_MAKENSIS_EXECUTABLE)
set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
--DCPACK_BINARY_NSIS:BOOL=ON)
+-DCPACK_BINARY_NSIS:BOOL=OFF)
endif()
add_test(CPackComponentsPrefix ${CMAKE_CTEST_COMMAND}
---
Summary of changes:
Tests/CMakeLists.txt |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1234-g2d49fa7
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 2d49fa73f23f4591bd22370ee34340a575d02183 (commit)
via 34f2dff61d65681cc54366544336d6085fd463b4 (commit)
from c8631b528e702c5dd11fe5a41ee7e9972caa24c9 (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=2d49fa73f23f4591bd22370ee34340a575d02183
commit 2d49fa73f23f4591bd22370ee34340a575d02183
Merge: c8631b5 34f2dff
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 09:48:30 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 09:48:30 2015 -0400
Merge topic 'cpack-archive-prefix' into next
34f2dff6 cpack: Fix some test failures caused by 36f7cbca9
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34f2dff61d65681cc54366544336d6085fd463b4
commit 34f2dff61d65681cc54366544336d6085fd463b4
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 07:21:27 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 26 07:21:27 2015 -0600
cpack: Fix some test failures caused by 36f7cbca9
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 373170b..b42a35e 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -64,7 +64,7 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
filePrefix += /;
}
const char* installPrefix =
this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
- if(installPrefix installPrefix[0] == '/')
+ if(installPrefix installPrefix[0] == '/' installPrefix[1] != 0)
{
// add to file prefix and remove the leading '/'
filePrefix += installPrefix+1;
---
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1228-g93b7164
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 93b7164a34f40d60dbfd625d0aa90b55304ed34f (commit)
via 36f7cbca985894fb03e4a395a110869cf67378a5 (commit)
from 8e5b1aa579c1ec68fd428ef29eecd9723812c3ed (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=93b7164a34f40d60dbfd625d0aa90b55304ed34f
commit 93b7164a34f40d60dbfd625d0aa90b55304ed34f
Merge: 8e5b1aa 36f7cbc
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 26 00:55:51 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 26 00:55:51 2015 -0400
Merge topic 'cpack-archive-prefix' into next
36f7cbca cpack: Fix handling of CPACK_PACKAGING_INSTALL_PREFIX for archives.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36f7cbca985894fb03e4a395a110869cf67378a5
commit 36f7cbca985894fb03e4a395a110869cf67378a5
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Mar 25 22:36:38 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Mar 25 22:48:47 2015 -0600
cpack: Fix handling of CPACK_PACKAGING_INSTALL_PREFIX for archives.
Fixes bug #14677 where the archive generator is used to package
components with an install prefix.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index e2437b5..373170b 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -63,6 +63,13 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
filePrefix = this-GetOption(CPACK_PACKAGE_FILE_NAME);
filePrefix += /;
}
+ const char* installPrefix =
this-GetOption(CPACK_PACKAGING_INSTALL_PREFIX);
+ if(installPrefix installPrefix[0] == '/')
+{
+// add to file prefix and remove the leading '/'
+filePrefix += installPrefix+1;
+filePrefix += /;
+}
std::vectorstd::string::const_iterator fileIt;
for (fileIt = component-Files.begin(); fileIt != component-Files.end();
++fileIt )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 41032f8..7135f5d 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -862,6 +862,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
set(CTEST_RUN_CPackComponents ${CTEST_TEST_CPACK})
set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
set(CTEST_RUN_CPackComponentsForAll ${CTEST_TEST_CPACK})
+ set(CTEST_RUN_CPackComponentsPrefix ${CTEST_TEST_CPACK})
# Do not try to build RPM
if (NOT RPMBUILD_EXECUTABLE)
@@ -1035,6 +1036,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/CPackTestAllGenerators)
endif()
+ if(CTEST_RUN_CPackComponentsPrefix)
+set(CPackComponents_BUILD_OPTIONS)
+if(APPLE)
+ set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
+endif()
+if(NSIS_MAKENSIS_EXECUTABLE)
+ set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
+-DCPACK_BINARY_NSIS:BOOL=ON)
+endif()
+
+add_test(CPackComponentsPrefix ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ ${CMake_SOURCE_DIR}/Tests/CPackComponentsPrefix
+ ${CMake_BINARY_DIR}/Tests/CPackComponentsPrefix
+ ${build_generator_args}
+ --build-project CPackComponentsPrefix
+ --build-two-config
+ --build-target package
+ --build-options ${build_options}
+-DCPACK_BINARY_DEB:BOOL=${CPACK_BINARY_DEB}
+-DCPACK_BINARY_RPM:BOOL=${CPACK_BINARY_RPM}
+${CPackComponents_BUILD_OPTIONS}
+)
+list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/CPackComponentsPrefix)
+ endif()
+
if(CTEST_package_X11_TEST)
set(X11_build_target_arg --build-target package)
else()
diff --git a/Tests/CPackComponentsPrefix/CMakeLists.txt
b/Tests/CPackComponentsPrefix/CMakeLists.txt
new file mode 100644
index 000..207dae8
--- /dev/null
+++ b/Tests/CPackComponentsPrefix/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.2)
+project(CPackComponentsPrefix NONE)
+
+install(FILES file-runtime.txt
+DESTINATION bin COMPONENT Runtime)
+install(FILES file-development.txt
+DESTINATION lib COMPONENT Development)
+
+set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY 1)
+set(CPACK_COMPONENTS_ALL Development)
+set(CPACK_ARCHIVE_COMPONENT_INSTALL 1)
+set(CPACK_PACKAGING_INSTALL_PREFIX /opt/My-1.0)
+include(CPack)
diff --git a/Tests/CPackComponentsPrefix/file-development.txt
b/Tests/CPackComponentsPrefix/file-development.txt
new file mode
[Cmake-commits] CMake branch, next, updated. v3.2.1-1213-g5fa4e63
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 5fa4e63ef5ec17d068a75700d5e40127ec82d2db (commit)
via 9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa (commit)
from 7ae7789e06051a8b8db16c5e3d2e7ef43ce44c6d (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=5fa4e63ef5ec17d068a75700d5e40127ec82d2db
commit 5fa4e63ef5ec17d068a75700d5e40127ec82d2db
Merge: 7ae7789 9c76ff0
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Mar 24 22:57:53 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 24 22:57:53 2015 -0400
Merge topic 'qtdialog-cpack-qt5-osx' into next
9c76ff01 QtDialog: Fix CMake packaging with CPack on OS X with Qt5.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa
commit 9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Mar 24 20:55:59 2015 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Mar 24 20:56:38 2015 -0600
QtDialog: Fix CMake packaging with CPack on OS X with Qt5.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index b59af94..9cc993a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -45,11 +45,11 @@ if (Qt5Widgets_FOUND)
get_filename_component(_qt_plugin_file ${_qt_plugin_path} NAME)
get_filename_component(_qt_plugin_type ${_qt_plugin_path} PATH)
get_filename_component(_qt_plugin_type ${_qt_plugin_type} NAME)
-set(_qt_plugin_dest
${CMAKE_INSTALL_PREFIX}/PlugIns/${_qt_plugin_type})
+set(_qt_plugin_dest PlugIns/${_qt_plugin_type})
install(FILES ${_qt_plugin_path}
DESTINATION ${_qt_plugin_dest})
set(${_qt_plugins_var}
- ${${_qt_plugins_var}};${_qt_plugin_dest}/${_qt_plugin_file})
+
${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file})
else()
message(FATAL_ERROR QT plugin ${_qt_plugin_name} not found)
endif()
---
Summary of changes:
Source/QtDialog/CMakeLists.txt |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1090-g80ca453
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 80ca453b3313688e40750f0908c05a77d5c4a3d4 (commit)
via 2c50db263a9e23b0240f769c335fb6f2ebc1b72a (commit)
from 15b62be62df4829a76f8de62785e81934610c77a (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=80ca453b3313688e40750f0908c05a77d5c4a3d4
commit 80ca453b3313688e40750f0908c05a77d5c4a3d4
Merge: 15b62be 2c50db2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Mar 18 23:05:04 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Mar 18 23:05:04 2015 -0400
Merge topic 'cpack-bundle-codesign' into next
2c50db26 CPack: Add support to overwrite or pass additional parameter to
codesign
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c50db263a9e23b0240f769c335fb6f2ebc1b72a
commit 2c50db263a9e23b0240f769c335fb6f2ebc1b72a
Author: André Klitzing aklitz...@gmail.com
AuthorDate: Wed Mar 11 13:04:15 2015 +0100
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Mar 18 20:53:30 2015 -0600
CPack: Add support to overwrite or pass additional parameter to codesign
diff --git a/Modules/CPackBundle.cmake b/Modules/CPackBundle.cmake
index d26a0b3..b412216 100644
--- a/Modules/CPackBundle.cmake
+++ b/Modules/CPackBundle.cmake
@@ -52,6 +52,11 @@
# list the main application folder, or the main executable. You should
# list any frameworks and plugins that are included in your app bundle.
#
+# .. variable:: CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER
+#
+# Additional parameter that will passed to codesign.
+# Default value: --deep -f
+#
# .. variable:: CPACK_COMMAND_CODESIGN
#
# Path to the codesign(1) command used to sign applications with an
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx
b/Source/CPack/cmCPackBundleGenerator.cxx
index 6e7a26b..01c3f8b 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -221,6 +221,10 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
bundle_path += .app;
// A list of additional files to sign, ie. frameworks and plugins.
+const std::string sign_parameter =
+ this-GetOption(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER)
+ ? this-GetOption(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER) : --deep -f;
+
const std::string sign_files =
this-GetOption(CPACK_BUNDLE_APPLE_CODESIGN_FILES)
? this-GetOption(CPACK_BUNDLE_APPLE_CODESIGN_FILES) : ;
@@ -234,7 +238,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
{
std::ostringstream temp_sign_file_cmd;
temp_sign_file_cmd this-GetOption(CPACK_COMMAND_CODESIGN);
- temp_sign_file_cmd --deep -f -s \ cpack_apple_cert_app;
+ temp_sign_file_cmd sign_parameter -s \
cpack_apple_cert_app;
temp_sign_file_cmd \ -i ;
temp_sign_file_cmd this-GetOption(CPACK_APPLE_BUNDLE_ID);
temp_sign_file_cmd \;
@@ -254,7 +258,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
// sign main binary
std::ostringstream temp_sign_binary_cmd;
temp_sign_binary_cmd this-GetOption(CPACK_COMMAND_CODESIGN);
-temp_sign_binary_cmd --deep -f -s \ cpack_apple_cert_app;
+temp_sign_binary_cmd sign_parameter -s \
cpack_apple_cert_app;
temp_sign_binary_cmd \ \ bundle_path \;
if(!this-RunCommand(temp_sign_binary_cmd, output))
@@ -269,7 +273,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
// sign app bundle
std::ostringstream temp_codesign_cmd;
temp_codesign_cmd this-GetOption(CPACK_COMMAND_CODESIGN);
-temp_codesign_cmd --deep -f -s \ cpack_apple_cert_app \;
+temp_codesign_cmd sign_parameter -s \
cpack_apple_cert_app \;
if(this-GetOption(CPACK_BUNDLE_APPLE_ENTITLEMENTS))
{
temp_codesign_cmd --entitlements ;
---
Summary of changes:
Modules/CPackBundle.cmake |5 +
Source/CPack/cmCPackBundleGenerator.cxx | 10 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-532-geb52b44
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 eb52b449c2006892e5d13a035ea3c9d31b1a602c (commit)
via 7b582d15ff4d70e77287eaf5abb4ea240eb26da6 (commit)
from 37e53989fc45ec2f99bc987332c013bc910d6fb4 (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=eb52b449c2006892e5d13a035ea3c9d31b1a602c
commit eb52b449c2006892e5d13a035ea3c9d31b1a602c
Merge: 37e5398 7b582d1
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Feb 20 10:19:19 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 20 10:19:19 2015 -0500
Merge topic 'cpack-bundle-codesign-output' into next
7b582d15 CPack: Print output from codesign if signing fails
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b582d15ff4d70e77287eaf5abb4ea240eb26da6
commit 7b582d15ff4d70e77287eaf5abb4ea240eb26da6
Author: André Klitzing aklitz...@gmail.com
AuthorDate: Fri Feb 20 10:45:14 2015 +0100
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Feb 20 08:17:53 2015 -0700
CPack: Print output from codesign if signing fails
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx
b/Source/CPack/cmCPackBundleGenerator.cxx
index e751568..6e7a26b 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -214,6 +214,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
// codesign the application.
if(!cpack_apple_cert_app.empty())
{
+std::string output;
std::string bundle_path;
bundle_path = src_dir + /;
bundle_path += this-GetOption(CPACK_BUNDLE_NAME);
@@ -240,11 +241,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
temp_sign_file_cmd bundle_path;
temp_sign_file_cmd it-c_str() \;
- if(!this-RunCommand(temp_sign_file_cmd))
+ if(!this-RunCommand(temp_sign_file_cmd, output))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
Error signing file:
- bundle_path it-c_str() std::endl);
+ bundle_path it-c_str() std::endl output std::endl);
return 0;
}
@@ -256,11 +257,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
temp_sign_binary_cmd --deep -f -s \ cpack_apple_cert_app;
temp_sign_binary_cmd \ \ bundle_path \;
-if(!this-RunCommand(temp_sign_binary_cmd))
+if(!this-RunCommand(temp_sign_binary_cmd, output))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
Error signing the application binary.
- std::endl);
+ std::endl output std::endl);
return 0;
}
@@ -276,11 +277,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string
src_dir)
}
temp_codesign_cmd \ bundle_path \;
-if(!this-RunCommand(temp_codesign_cmd))
+if(!this-RunCommand(temp_codesign_cmd, output))
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
Error signing the application package.
- std::endl);
+ std::endl output std::endl);
return 0;
}
---
Summary of changes:
Source/CPack/cmCPackBundleGenerator.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.1-2346-gc350d78
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 c350d78f7baf5db77b808f99911bb07a069da1bf (commit)
via 8ced6375dfd366a088c681e45c0d8cdb4ea04dde (commit)
via b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f (commit)
via c19539c594c4099fd4de68c2e386347d1cb0667f (commit)
from d4506d1708d5da92f5ba26b43262db6d8b0077f9 (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=c350d78f7baf5db77b808f99911bb07a069da1bf
commit c350d78f7baf5db77b808f99911bb07a069da1bf
Merge: d4506d1 8ced637
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 26 11:23:19 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 26 11:23:19 2015 -0500
Merge topic 'cmake-gui-osx' into next
8ced6375 cmake-gui: Shrink spacing between search field and checkbox.
b46a1519 cmake-gui: Change install buttons to activate on clicked instead
of pressed.
c19539c5 cmake-gui: Fix install menu to be available for Qt5 builds on OS X.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ced6375dfd366a088c681e45c0d8cdb4ea04dde
commit 8ced6375dfd366a088c681e45c0d8cdb4ea04dde
Author: Kevin Wojniak kain...@kainjow.com
AuthorDate: Mon Jan 26 07:49:25 2015 -0800
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 09:22:21 2015 -0700
cmake-gui: Shrink spacing between search field and checkbox.
This allows the search field to show on OS X Yosemite
diff --git a/Source/QtDialog/CMakeSetupDialog.ui
b/Source/QtDialog/CMakeSetupDialog.ui
index 98da249..b04bd93 100644
--- a/Source/QtDialog/CMakeSetupDialog.ui
+++ b/Source/QtDialog/CMakeSetupDialog.ui
@@ -134,7 +134,7 @@
/property
property name=sizeHint stdset=0
size
- width40/width
+ width12/width
height23/height
/size
/property
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f
commit b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f
Author: Kevin Wojniak kain...@kainjow.com
AuthorDate: Mon Jan 26 07:48:57 2015 -0800
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 09:21:36 2015 -0700
cmake-gui: Change install buttons to activate on clicked instead of pressed.
This matches the behavior of other buttons.
diff --git a/Source/QtDialog/QMacInstallDialog.cxx
b/Source/QtDialog/QMacInstallDialog.cxx
index 8b8c531..fa7df43 100644
--- a/Source/QtDialog/QMacInstallDialog.cxx
+++ b/Source/QtDialog/QMacInstallDialog.cxx
@@ -15,11 +15,11 @@ QMacInstallDialog::QMacInstallDialog(QWidget*w)
{
this-Internals = new QMacInstallDialogInternals;
this-Internals-setupUi(this);
- QObject::connect(this-Internals-choosePathButton, SIGNAL(pressed()),
+ QObject::connect(this-Internals-choosePathButton, SIGNAL(clicked(bool)),
this, SLOT(ShowBrowser()));
- QObject::connect(this-Internals-skipInstallButton, SIGNAL(pressed()),
+ QObject::connect(this-Internals-skipInstallButton, SIGNAL(clicked(bool)),
this, SLOT(SkipInstall()));
- QObject::connect(this-Internals-doInstallButton, SIGNAL(pressed()),
+ QObject::connect(this-Internals-doInstallButton, SIGNAL(clicked(bool)),
this, SLOT(DoInstall()));
this-Internals-InstallPrefix-setText(/usr/bin/);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c19539c594c4099fd4de68c2e386347d1cb0667f
commit c19539c594c4099fd4de68c2e386347d1cb0667f
Author: Kevin Wojniak kain...@kainjow.com
AuthorDate: Mon Jan 26 07:47:57 2015 -0800
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 09:20:49 2015 -0700
cmake-gui: Fix install menu to be available for Qt5 builds on OS X.
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index 0574681..b8077f2 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -119,7 +119,7 @@ CMakeSetupDialog::CMakeSetupDialog()
QAction* showChangesAction = ToolsMenu-addAction(tr(Show My Changes));
QObject::connect(showChangesAction, SIGNAL(triggered(bool)),
this, SLOT(showUserChanges()));
-#if defined(Q_WS_MAC)
+#if defined(Q_WS_MAC) || defined(Q_OS_MAC)
this-InstallForCommandLineAction
= ToolsMenu-addAction(tr(Install For Command Line Use));
QObject::connect(this-InstallForCommandLineAction, SIGNAL(triggered(bool)),
---
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx |2 +-
Source/QtDialog
[Cmake-commits] CMake branch, next, updated. v3.1.1-2342-gd4506d1
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 d4506d1708d5da92f5ba26b43262db6d8b0077f9 (commit)
via b17d835f7d6047dfb5ec33283eb75c4c5ebdc353 (commit)
via f31d11f635edd36d6ef3d946a475565533b33854 (commit)
via 0379c24d878e763ebb5918014fc58380a379ac18 (commit)
via c805a31c2ced7199b2807cecc22213e96c0279c8 (commit)
from a2742925ced9b822a2249aad5982b5d8f07c8c02 (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=d4506d1708d5da92f5ba26b43262db6d8b0077f9
commit d4506d1708d5da92f5ba26b43262db6d8b0077f9
Merge: a274292 b17d835
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 26 10:38:00 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 26 10:38:00 2015 -0500
Merge topic 'file-strings-utf-16' into next
b17d835f StringFileTest: Use LENGTH_MINIMUM instead of REGEX.
f31d11f6 StringFileTest: read files using same encoding. Add tests for BOM
use.
0379c24d Add test for file(STRINGS) with UTF-16 and UTF-32 encodings.
c805a31c file STRINGS UTF-16 and UTF-32 convertible to ASCII
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b17d835f7d6047dfb5ec33283eb75c4c5ebdc353
commit b17d835f7d6047dfb5ec33283eb75c4c5ebdc353
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 26 08:27:59 2015 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 08:32:13 2015 -0700
StringFileTest: Use LENGTH_MINIMUM instead of REGEX.
This clarifies the intent of getting strings longer than 4.
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index 3998b7e..539b854 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -69,7 +69,7 @@ endif()
foreach(bit 16 32)
foreach(endian LE BE)
set(file_to_check UTF-${bit}${endian}.txt)
-file(STRINGS ${file_to_check} str ENCODING UTF-${bit}${endian} REGEX
)
+file(STRINGS ${file_to_check} str ENCODING UTF-${bit}${endian}
LENGTH_MINIMUM 4)
message(${file_to_check} as UTF-${bit}${endian}: ${str})
if(NOT str MATCHES Hello World)
message(SEND_ERROR
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f31d11f635edd36d6ef3d946a475565533b33854
commit f31d11f635edd36d6ef3d946a475565533b33854
Author: Justin Borodinsky justin.borodin...@gmail.com
AuthorDate: Fri Jan 16 20:13:01 2015 -0500
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 08:32:13 2015 -0700
StringFileTest: read files using same encoding. Add tests for BOM use.
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index 7a818cb..3998b7e 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -69,22 +69,25 @@ endif()
foreach(bit 16 32)
foreach(endian LE BE)
set(file_to_check UTF-${bit}${endian}.txt)
-foreach(bit_check 16 32)
- foreach(endian_check LE BE)
-file(STRINGS ${file_to_check} str ENCODING
UTF-${bit_check}${endian_check})
-if(${bit} STREQUAL ${bitcheck})
- if(NOT str MATCHES Hello World)
-message(SEND_ERROR
+file(STRINGS ${file_to_check} str ENCODING UTF-${bit}${endian} REGEX
)
+message(${file_to_check} as UTF-${bit}${endian}: ${str})
+if(NOT str MATCHES Hello World)
+message(SEND_ERROR
file(STRINGS) incorrectly read from ${file_to_check} file
[${str}])
- endif()
-else()
- if(NOT ${str} STREQUAL )
-message(SEND_ERROR
+endif()
+ endforeach()
+endforeach()
+
+# check files using BOM for encoding
+foreach(bit 16 32)
+ foreach(endian LE BE)
+set(file_to_check UTF-${bit}${endian}.txt)
+file(STRINGS ${file_to_check} str REGEX )
+message(${file_to_check} : ${str})
+if(NOT str MATCHES Hello World)
+message(SEND_ERROR
file(STRINGS) incorrectly read from ${file_to_check} file
[${str}])
- endif()
-endif()
- endforeach()
-endforeach()
+endif()
endforeach()
endforeach()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0379c24d878e763ebb5918014fc58380a379ac18
commit 0379c24d878e763ebb5918014fc58380a379ac18
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jan 13 22:29:55 2015 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 08:32:13 2015 -0700
Add test for file(STRINGS) with UTF-16 and UTF-32 encodings.
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index faf3bc9
[Cmake-commits] CMake branch, next, updated. v3.1.1-2364-g6031673
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 60316739d134a6c76e435746f4c6009220e533a9 (commit)
via b359ee994ea80fccd7eff1b01e33cbcce879a545 (commit)
via 4c53670b6444b16e8d39a46aebd39fc166895755 (commit)
from 0492ede11b4f4b396a5f2f5ccbcb0a7bcb0e2167 (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=60316739d134a6c76e435746f4c6009220e533a9
commit 60316739d134a6c76e435746f4c6009220e533a9
Merge: 0492ede b359ee9
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 26 18:30:26 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 26 18:30:26 2015 -0500
Merge topic 'file-strings-utf-16' into next
b359ee99 Add documentation for new ENCODING options in file(STRINGS).
4c53670b Move test cases for file(STRINGS .. ENCODING ...) to
Tests/RunCMake.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b359ee994ea80fccd7eff1b01e33cbcce879a545
commit b359ee994ea80fccd7eff1b01e33cbcce879a545
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 26 16:28:00 2015 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 16:30:05 2015 -0700
Add documentation for new ENCODING options in file(STRINGS).
diff --git a/Help/command/file.rst b/Help/command/file.rst
index b0d4792..73d4cfa 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -65,7 +65,10 @@ Parse a list of ASCII strings from ``filename`` and store
it in
Consider only strings that match the given regular expression.
``ENCODING encoding-type``
- Consider strings of a given encoding. UTF-8 is currently supported.
+ Consider strings of a given encoding. Currently supported encodings are:
+ UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE. If the ENCODING option
+ is not provided and the file has a Byte Order Mark, the ENCODING option
+ will be defaulted to respect the Byte Order Mark.
For example, the code
diff --git a/Help/release/dev/file-strings-utf-16.rst
b/Help/release/dev/file-strings-utf-16.rst
new file mode 100644
index 000..f40b63e
--- /dev/null
+++ b/Help/release/dev/file-strings-utf-16.rst
@@ -0,0 +1,5 @@
+file-strings-utf-16
+---
+
+* The :command:`file(STRINGS)` now supports UTF-16LE, UTF-16BE,
+ UTF-32LE, UTF-32BE as ``ENCODING`` options.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c53670b6444b16e8d39a46aebd39fc166895755
commit 4c53670b6444b16e8d39a46aebd39fc166895755
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 26 15:27:36 2015 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 26 15:27:36 2015 -0700
Move test cases for file(STRINGS .. ENCODING ...) to Tests/RunCMake.
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake
b/Tests/RunCMake/string/RunCMakeTest.cmake
index fc913c6..89f7ea5 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -12,3 +12,8 @@ run_cmake(UuidMissingTypeValue)
run_cmake(UuidBadType)
run_cmake(RegexClear)
+
+run_cmake(UTF-16BE)
+run_cmake(UTF-16LE)
+run_cmake(UTF-32BE)
+run_cmake(UTF-32LE)
diff --git a/Tests/RunCMake/string/UTF-16BE-stderr.txt
b/Tests/RunCMake/string/UTF-16BE-stderr.txt
new file mode 100644
index 000..8254f87
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16BE-stderr.txt
@@ -0,0 +1,2 @@
+Hello World
+Hello World
diff --git a/Tests/RunCMake/string/UTF-16BE.cmake
b/Tests/RunCMake/string/UTF-16BE.cmake
new file mode 100644
index 000..da986c0
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16BE.cmake
@@ -0,0 +1,4 @@
+file(STRINGS UTF-16BE.txt str ENCODING UTF-16BE LENGTH_MINIMUM 4)
+message(${str})
+file(STRINGS UTF-16BE.txt str LENGTH_MINIMUM 4)
+message(${str})
diff --git a/Tests/StringFileTest/UTF-16BE.txt
b/Tests/RunCMake/string/UTF-16BE.txt
similarity index 100%
rename from Tests/StringFileTest/UTF-16BE.txt
rename to Tests/RunCMake/string/UTF-16BE.txt
diff --git a/Tests/RunCMake/string/UTF-16LE-stderr.txt
b/Tests/RunCMake/string/UTF-16LE-stderr.txt
new file mode 100644
index 000..8254f87
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16LE-stderr.txt
@@ -0,0 +1,2 @@
+Hello World
+Hello World
diff --git a/Tests/RunCMake/string/UTF-16LE.cmake
b/Tests/RunCMake/string/UTF-16LE.cmake
new file mode 100644
index 000..326d848
--- /dev/null
+++ b/Tests/RunCMake/string/UTF-16LE.cmake
@@ -0,0 +1,4 @@
+file(STRINGS UTF-16LE.txt str ENCODING UTF-16LE LENGTH_MINIMUM 4)
+message(${str})
+file(STRINGS UTF-16LE.txt str LENGTH_MINIMUM 4)
+message(${str})
diff --git a/Tests/StringFileTest/UTF-16LE.txt
b/Tests/RunCMake/string/UTF
[Cmake-commits] CMake branch, next, updated. v3.1.0-1984-gc4b0c12
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 c4b0c12aa0c4745f6995b52c55deb7527a52f43b (commit) via 39c66ed71b96fdbc93215ffd6aee6bd2f3e683cb (commit) from ea660cfeb3d1f9f0fc85e226563d93162b043f83 (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=c4b0c12aa0c4745f6995b52c55deb7527a52f43b commit c4b0c12aa0c4745f6995b52c55deb7527a52f43b Merge: ea660cf 39c66ed Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Jan 15 17:07:44 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jan 15 17:07:44 2015 -0500 Merge topic 'windows-utf-8' into next 39c66ed7 Clarify docs about UTF-8 support. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39c66ed71b96fdbc93215ffd6aee6bd2f3e683cb commit 39c66ed71b96fdbc93215ffd6aee6bd2f3e683cb Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Jan 15 15:06:34 2015 -0700 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Thu Jan 15 15:06:34 2015 -0700 Clarify docs about UTF-8 support. diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst index a4e3ff0..3d984e9 100644 --- a/Help/release/dev/windows-utf-8.rst +++ b/Help/release/dev/windows-utf-8.rst @@ -1,10 +1,12 @@ windows-utf-8 - -* On Windows, CMake learned to support Unicode characters. This allows using - characters from multiple (spoken) languages in CMake code and in paths to - source files. Because CMake interoperates with many other tools, there may - still be some limitations when using certain Unicode characters. +* On Windows, CMake learned to support international characters. This allows using + characters from multiple (spoken) languages in CMake code such as CMakeLists.txt + and .cmake files, in paths to source files, configured files such as .h.in files + and other files read and written by CMake. Because CMake interoperates with many + other tools, there may still be some limitations when using certain international + characters. Files written in the :manual:`cmake-language(7)`, such as ``CMakeLists.txt`` or ``*.cmake`` files, are expected to be encoded as UTF-8. If files are --- Summary of changes: Help/release/dev/windows-utf-8.rst | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1919-gdb5583d
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 db5583de060221ed7af339eb1a9101d43794f11a (commit) via 67384cf24f1431e3db942ab10e42eb79276611bd (commit) from e9ecfbc0de78bda55e0fae8fe3c0fcab63d6a231 (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=db5583de060221ed7af339eb1a9101d43794f11a commit db5583de060221ed7af339eb1a9101d43794f11a Merge: e9ecfbc 67384cf Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Jan 14 17:08:46 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 14 17:08:46 2015 -0500 Merge topic 'windows-utf-8' into next 67384cf2 Fix release note for windows-utf-8, and update cmake-language docs. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67384cf24f1431e3db942ab10e42eb79276611bd commit 67384cf24f1431e3db942ab10e42eb79276611bd Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Jan 14 15:07:55 2015 -0700 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Wed Jan 14 15:07:55 2015 -0700 Fix release note for windows-utf-8, and update cmake-language docs. In cmake-language, a note was added about UTF-8 support on Windows. diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst index 15c101f..1d4b09c 100644 --- a/Help/manual/cmake-language.7.rst +++ b/Help/manual/cmake-language.7.rst @@ -60,15 +60,16 @@ Syntax Encoding -A CMake Language source file must be written in 7-bit ASCII text -to be portable across all supported platforms. Newlines may be +A CMake Language source file may be written in 7-bit ASCII text for +maximum portability across all supported platforms. Newlines may be encoded as either ``\n`` or ``\r\n`` but will be converted to ``\n`` as input files are read. Note that the implementation is 8-bit clean so source files may be encoded as UTF-8 on platforms with system APIs supporting this -encoding. Furthermore, CMake 3.0 and above allow a leading UTF-8 -`Byte-Order Mark`_ in source files. +encoding. In addition, CMake 3.2 and above support UTF-8 files on +Windows while using UTF-16 to call system APIs. Furthermore, CMake 3.0 +and above allow a leading UTF-8 `Byte-Order Mark`_ in source files. .. _`Byte-Order Mark`: http://en.wikipedia.org/wiki/Byte_order_mark diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst index fe02153..9438cdc 100644 --- a/Help/release/dev/windows-utf-8.rst +++ b/Help/release/dev/windows-utf-8.rst @@ -11,7 +11,7 @@ windows-utf-8 Latin 1 languages such as those found in North and South America and Western Europe. With UTF-8, additional languages are supported. - The CMakeLists.txt file and other files read by CMake file are expected - to be UTF-8 encoded. If files are already ASCII, they will be compatible. - If files were in a different encoding, including Latin 1, they will need to - be converted. + Files written in the :manual:`cmake-language(7)`, such as + ``CMakeLists.txt`` for ``*.cmake`` files are expected to be UTF-8 encoded. + If files are already ASCII, they will be compatible. If files were in a + different encoding, including Latin 1, they will need to be converted. --- Summary of changes: Help/manual/cmake-language.7.rst |9 + Help/release/dev/windows-utf-8.rst |8 2 files changed, 9 insertions(+), 8 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1893-gb4346c1
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 b4346c10c6f407b069c5db7ace6d325b83404c1c (commit) via 8de75f13b69b5e3498330e3f0d509bd66e340ed9 (commit) from a403754fe0761fee9e60e185c003bcef04c719c3 (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=b4346c10c6f407b069c5db7ace6d325b83404c1c commit b4346c10c6f407b069c5db7ace6d325b83404c1c Merge: a403754 8de75f1 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Jan 14 11:02:42 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 14 11:02:42 2015 -0500 Merge topic 'windows-utf-8' into next 8de75f13 Add release note for windows-utf-8. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8de75f13b69b5e3498330e3f0d509bd66e340ed9 commit 8de75f13b69b5e3498330e3f0d509bd66e340ed9 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Jan 14 09:01:37 2015 -0700 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Wed Jan 14 09:01:37 2015 -0700 Add release note for windows-utf-8. diff --git a/Help/release/dev/windows-utf-8.rst b/Help/release/dev/windows-utf-8.rst new file mode 100644 index 000..fe02153 --- /dev/null +++ b/Help/release/dev/windows-utf-8.rst @@ -0,0 +1,17 @@ +windows-utf-8 +- + +* The Windows version of CMake has been enhanced to use Unicode. This + allows using characters from multiple languages in CMake. Because CMake + interoperates with many other tools, there may still be some limitations + when using certain Unicode characters. + + The Visual Studio generators have been enhanced to write solution and + project files in UTF-8 instead of Windows-1252. Windows-1252 supported + Latin 1 languages such as those found in North and South America and Western + Europe. With UTF-8, additional languages are supported. + + The CMakeLists.txt file and other files read by CMake file are expected + to be UTF-8 encoded. If files are already ASCII, they will be compatible. + If files were in a different encoding, including Latin 1, they will need to + be converted. --- Summary of changes: Help/release/dev/windows-utf-8.rst | 17 + 1 file changed, 17 insertions(+) create mode 100644 Help/release/dev/windows-utf-8.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1870-g84fa667
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 84fa667ac294544aee9b0baed03f49776d6b1d1e (commit) via 17f2053b9dbe7c23fe56fea0550bd5dd19ba510d (commit) via 2ece34516a6c4f99d27c42018b3548d0cb75e72e (commit) from 261a06e8ed0fd47ceb7d38cd3f64061a6e5ee876 (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=84fa667ac294544aee9b0baed03f49776d6b1d1e commit 84fa667ac294544aee9b0baed03f49776d6b1d1e Merge: 261a06e 17f2053b Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Jan 14 01:59:36 2015 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jan 14 01:59:36 2015 -0500 Merge topic 'windows-utf-8' into next 17f2053b Encoding: Switch to use UTF-8 internally by default on Windows. 2ece3451 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17f2053b9dbe7c23fe56fea0550bd5dd19ba510d commit 17f2053b9dbe7c23fe56fea0550bd5dd19ba510d Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Fri Dec 26 21:25:20 2014 -0700 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Tue Jan 13 23:54:41 2015 -0700 Encoding: Switch to use UTF-8 internally by default on Windows. This fixes several reported bugs about CMake not handling non-ascii paths on Windows. Practically, the use of some unicode characters may still be limited by the build or compiler tools. For example, a user may be limited by the build tools to using characters within the Windows ANSI code page (which can include non-ascii characters in the current system language). diff --git a/CMakeLists.txt b/CMakeLists.txt index 1812b27..33d2ce6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ if(NOT DEFINED CMAKE_CXX_STANDARD) endif() # option to set the internal encoding of CMake to UTF-8 -option(CMAKE_ENCODING_UTF8 Use UTF-8 encoding internally (experimental). OFF) +option(CMAKE_ENCODING_UTF8 Use UTF-8 encoding internally. ON) mark_as_advanced(CMAKE_ENCODING_UTF8) if(CMAKE_ENCODING_UTF8) set(KWSYS_ENCODING_DEFAULT_CODEPAGE CP_UTF8) --- Summary of changes: CMakeLists.txt|2 +- Source/CMakeVersion.cmake |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1597-gcbda3a7
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 cbda3a77ec426b6340d705eeb153f53346b53191 (commit)
via 61cf781a6216c55a60fb73d4fb5fab76b1e7fc34 (commit)
from def4979cf2be3342b9e46d44da13d2b51670f685 (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=cbda3a77ec426b6340d705eeb153f53346b53191
commit cbda3a77ec426b6340d705eeb153f53346b53191
Merge: def4979 61cf781
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Jan 8 22:47:53 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 8 22:47:53 2015 -0500
Merge topic 'sln-bom' into next
61cf781a Encoding: Write Visual Studio solution file with BOM.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61cf781a6216c55a60fb73d4fb5fab76b1e7fc34
commit 61cf781a6216c55a60fb73d4fb5fab76b1e7fc34
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 26 21:15:29 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 26 21:15:29 2014 -0700
Encoding: Write Visual Studio solution file with BOM.
When configured to use UTF-8 internally, add a UTF-8 BOM
to generated .sln files for Visual Studio to correctly
handle them.
Otherwise, some versions of Visual Studio will read them
as ANSI encoded files.
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx
b/Source/cmGlobalVisualStudio71Generator.cxx
index a67a649..64f9cee 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -93,6 +93,11 @@ void cmGlobalVisualStudio71Generator
cmLocalGenerator* root,
std::vectorcmLocalGenerator* generators)
{
+#ifdef CMAKE_ENCODING_UTF8
+ // Add UTF-8 BOM for .sln file to indicate encoding
+ const unsigned char utf8_bom[3] = {0xEF,0xBB,0xBF};
+ fout.write(reinterpret_castconst char*(utf8_bom), 3);
+#endif
// Write out the header for a SLN file
this-WriteSLNHeader(fout);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index 401e475..0eb7d2c 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -558,6 +558,11 @@ void cmGlobalVisualStudio7Generator
cmLocalGenerator* root,
std::vectorcmLocalGenerator* generators)
{
+#ifdef CMAKE_ENCODING_UTF8
+ // Add UTF-8 BOM for .sln file to indicate encoding
+ const unsigned char utf8_bom[3] = {0xEF,0xBB,0xBF};
+ fout.write(reinterpret_castconst char*(utf8_bom), 3);
+#endif
// Write out the header for a SLN file
this-WriteSLNHeader(fout);
---
Summary of changes:
Source/cmGlobalVisualStudio71Generator.cxx |5 +
Source/cmGlobalVisualStudio7Generator.cxx |5 +
2 files changed, 10 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1599-g7b5da14
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 7b5da14d074e365b812802b0b8c1be8aedf770fd (commit)
via 9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a (commit)
from cbda3a77ec426b6340d705eeb153f53346b53191 (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=7b5da14d074e365b812802b0b8c1be8aedf770fd
commit 7b5da14d074e365b812802b0b8c1be8aedf770fd
Merge: cbda3a7 9a8ab86
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Jan 8 23:07:00 2015 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 8 23:07:00 2015 -0500
Merge topic 'tests-encoding' into next
9a8ab866 Encoding: Modify tests to work using non-ascii paths.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a
commit 9a8ab86645b0ea1fcbd1b069694d0cbb4fa2621a
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 26 21:19:14 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Jan 8 20:56:51 2015 -0700
Encoding: Modify tests to work using non-ascii paths.
For complex*, CustomCommand and OutDir tests, non-ascii paths
are avoided in test code by using relative paths, and setting
the working when running the test. This also avoids the
need to internationalize the test code.
For RunCMake.GeneratorExpression, use a UTF-8 encoding in
file(STRINGS) to retrieve the compiled absolute path correctly.
diff --git a/Tests/Complex/Executable/CMakeLists.txt
b/Tests/Complex/Executable/CMakeLists.txt
index bf23d4a..508221c 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -89,18 +89,22 @@ remove_definitions(-DCOMPLEX_DEFINED)
# Test pre-build/pre-link/post-build rules for an executable.
add_custom_command(TARGET complex PRE_BUILD
COMMAND ${CREATE_FILE_EXE}
- ARGS ${Complex_BINARY_DIR}/Executable/prebuild.txt)
+ ARGS Executable/prebuild.txt
+ WORKING_DIRECTORY ${Complex_BINARY_DIR})
add_custom_command(TARGET complex PRE_LINK
COMMAND ${CREATE_FILE_EXE}
- ARGS ${Complex_BINARY_DIR}/Executable/prelink.txt)
+ ARGS Executable/prelink.txt
+ WORKING_DIRECTORY ${Complex_BINARY_DIR})
add_custom_command(TARGET complex POST_BUILD
COMMAND ${CREATE_FILE_EXE}
- ARGS ${Complex_BINARY_DIR}/Executable/postbuild.txt)
+ ARGS Executable/postbuild.txt
+ WORKING_DIRECTORY ${Complex_BINARY_DIR})
add_custom_command(TARGET complex POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy
-${Complex_BINARY_DIR}/Executable/postbuild.txt
-${Complex_BINARY_DIR}/Executable/postbuild2.txt)
+Executable/postbuild.txt
+Executable/postbuild2.txt
+ WORKING_DIRECTORY ${Complex_BINARY_DIR})
set_source_files_properties(complex
COMPILE_FLAGS
diff --git a/Tests/Complex/Executable/complex.cxx
b/Tests/Complex/Executable/complex.cxx
index 31442ba..ec222a5 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -716,14 +716,14 @@ int main()
// the file was removed the last time 'complex' was run, and it is
// only created during a build.
- TestAndRemoveFile(BINARY_DIR /Library/prebuild.txt);
- TestAndRemoveFile(BINARY_DIR /Library/prelink.txt);
- TestAndRemoveFile(BINARY_DIR /Library/postbuild.txt);
- TestAndRemoveFile(BINARY_DIR /Library/postbuild2.txt);
- TestAndRemoveFile(BINARY_DIR /Executable/prebuild.txt);
- TestAndRemoveFile(BINARY_DIR /Executable/prelink.txt);
- TestAndRemoveFile(BINARY_DIR /Executable/postbuild.txt);
- TestAndRemoveFile(BINARY_DIR /Executable/postbuild2.txt);
+ TestAndRemoveFile(Library/prebuild.txt);
+ TestAndRemoveFile(Library/prelink.txt);
+ TestAndRemoveFile(Library/postbuild.txt);
+ TestAndRemoveFile(Library/postbuild2.txt);
+ TestAndRemoveFile(Executable/prebuild.txt);
+ TestAndRemoveFile(Executable/prelink.txt);
+ TestAndRemoveFile(Executable/postbuild.txt);
+ TestAndRemoveFile(Executable/postbuild2.txt);
// --
// A custom target has been created (see Library/).
@@ -733,12 +733,12 @@ int main()
// the file was removed the last time 'complex' was run, and it is
// only created during a build.
- TestAndRemoveFile(BINARY_DIR /Library
[Cmake-commits] CMake branch, next, updated. v3.1.0-1333-g4da0681
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 4da0681a70ac512367d59c93703e91e76cc62192 (commit)
via c294a115f2a44b60eb6343324e15933ef8a4593d (commit)
via e42da30782785a02f0fabc385d14ac8f561af602 (commit)
from 15162ca3106d95b0f867b9a89d9b3a6dd0008297 (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=4da0681a70ac512367d59c93703e91e76cc62192
commit 4da0681a70ac512367d59c93703e91e76cc62192
Merge: 15162ca c294a11
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Dec 22 13:34:20 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 22 13:34:20 2014 -0500
Merge topic 'macho-parser' into next
c294a115 Mach-O: Use Mach-O parser to extract install names instead of
otool.
e42da307 Mach-O: Add Mach-O parser for OS X and iOS.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c294a115f2a44b60eb6343324e15933ef8a4593d
commit c294a115f2a44b60eb6343324e15933ef8a4593d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 12:31:22 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Dec 22 11:33:00 2014 -0700
Mach-O: Use Mach-O parser to extract install names instead of otool.
This has much better performance than calling otool or xcrun -r otool
to extract install names for rpath support.
Fixes bug #15178.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c83dc2a..1c8c387 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -63,6 +63,10 @@
# include cmELF.h
#endif
+#if defined(CMAKE_USE_MACH_PARSER)
+# include cmMachO.h
+#endif
+
class cmSystemToolsFileTime
{
public:
@@ -2357,31 +2361,17 @@ bool cmSystemTools::GuessLibrarySOName(std::string
const fullPath,
bool cmSystemTools::GuessLibraryInstallName(std::string const fullPath,
std::string soname)
{
- std::vectorstd::string cmds;
- cmds.push_back(otool);
- cmds.push_back(-D);
- cmds.push_back(fullPath);
-
- std::string output;
- if(!RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE))
+#if defined(CMAKE_USE_MACH_PARSER)
+ cmMachO macho(fullPath.c_str());
+ if(macho)
{
-cmds.insert(cmds.begin(), -r);
-cmds.insert(cmds.begin(), xcrun);
-if(!RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE))
- {
- return false;
- }
+return macho.GetInstallName(soname);
}
+#else
+ (void)fullPath;
+ (void)soname;
+#endif
- std::vectorstd::string strs = cmSystemTools::tokenize(output, \n);
- // otool returns extra lines reporting multiple install names
- // in case the binary is multi-arch and none of the architectures
- // is native (e.g. i386;ppc on x86_64)
- if(strs.size() = 2)
-{
-soname = strs[1];
-return true;
-}
return false;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e42da30782785a02f0fabc385d14ac8f561af602
commit e42da30782785a02f0fabc385d14ac8f561af602
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 12:30:22 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Dec 22 11:32:10 2014 -0700
Mach-O: Add Mach-O parser for OS X and iOS.
This parser also supports fat binaries which archive multiple
Mach-O binaries.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index a4c982f..97f57a3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -39,6 +39,10 @@ else()
set(CMAKE_USE_ELF_PARSER)
endif()
+if(APPLE)
+ set(CMAKE_USE_MACH_PARSER 1)
+endif()
+
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
# ensure Unicode friendly APIs are used on Windows
@@ -140,6 +144,11 @@ if(CMAKE_USE_ELF_PARSER)
set(ELF_SRCS cmELF.h cmELF.cxx)
endif()
+# Check if we can build the Mach-O parser.
+if(CMAKE_USE_MACH_PARSER)
+ set(MACH_SRCS cmMachO.h cmMachO.cxx)
+endif()
+
#
# Sources for CMakeLib
#
@@ -267,6 +276,7 @@ set(SRCS
cmLocalGenerator.cxx
cmLocalGenerator.h
cmLocalUnixMakefileGenerator3.cxx
+ ${MACH_SRCS}
cmMakeDepend.cxx
cmMakeDepend.h
cmMakefile.cxx
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 2b0280d..79776f4 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -16,5 +16,6 @@
#cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE
#cmakedefine HAVE_UNSETENV
#cmakedefine CMAKE_USE_ELF_PARSER
+#cmakedefine CMAKE_USE_MACH_PARSER
#cmakedefine CMAKE_ENCODING_UTF8
#define CMAKE_DATA_DIR /@CMAKE_DATA_DIR@
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
new file mode 100644
index 000..1607845
[Cmake-commits] CMake branch, next, updated. v3.1.0-1292-gb0d35d9
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 b0d35d9e647b105718361b62a5ca230cdec3e782 (commit)
via a5523142c5ecb29c54d5ae45edb7bff62b2a46cb (commit)
via d92c95bc71923f4fcf774fd0cf33d2dbcc7a9174 (commit)
from 8a1b7e7f4783873b0ed3bbfaf2a29b33afe86940 (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=b0d35d9e647b105718361b62a5ca230cdec3e782
commit b0d35d9e647b105718361b62a5ca230cdec3e782
Merge: 8a1b7e7 a552314
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 16:16:53 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 19 16:16:53 2014 -0500
Merge topic 'macho-parser' into next
a5523142 Use Mach-O parser to extract install names instead of otool.
d92c95bc Add Mach-O parser for OS X and iOS.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5523142c5ecb29c54d5ae45edb7bff62b2a46cb
commit a5523142c5ecb29c54d5ae45edb7bff62b2a46cb
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 12:31:22 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 19 12:49:10 2014 -0700
Use Mach-O parser to extract install names instead of otool.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c83dc2a..ee707ec 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -63,6 +63,10 @@
# include cmELF.h
#endif
+#if defined(CMAKE_USE_MACH_PARSER)
+# include cmMachO.h
+#endif
+
class cmSystemToolsFileTime
{
public:
@@ -2357,31 +2361,14 @@ bool cmSystemTools::GuessLibrarySOName(std::string
const fullPath,
bool cmSystemTools::GuessLibraryInstallName(std::string const fullPath,
std::string soname)
{
- std::vectorstd::string cmds;
- cmds.push_back(otool);
- cmds.push_back(-D);
- cmds.push_back(fullPath);
-
- std::string output;
- if(!RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE))
+#if defined(CMAKE_USE_MACH_PARSER)
+ cmMachO macho(fullPath.c_str());
+ if(macho)
{
-cmds.insert(cmds.begin(), -r);
-cmds.insert(cmds.begin(), xcrun);
-if(!RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE))
- {
- return false;
- }
+return macho.GetInstallName(soname);
}
+#endif
- std::vectorstd::string strs = cmSystemTools::tokenize(output, \n);
- // otool returns extra lines reporting multiple install names
- // in case the binary is multi-arch and none of the architectures
- // is native (e.g. i386;ppc on x86_64)
- if(strs.size() = 2)
-{
-soname = strs[1];
-return true;
-}
return false;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d92c95bc71923f4fcf774fd0cf33d2dbcc7a9174
commit d92c95bc71923f4fcf774fd0cf33d2dbcc7a9174
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 12:30:22 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 19 12:49:06 2014 -0700
Add Mach-O parser for OS X and iOS.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index a4c982f..97f57a3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -39,6 +39,10 @@ else()
set(CMAKE_USE_ELF_PARSER)
endif()
+if(APPLE)
+ set(CMAKE_USE_MACH_PARSER 1)
+endif()
+
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
# ensure Unicode friendly APIs are used on Windows
@@ -140,6 +144,11 @@ if(CMAKE_USE_ELF_PARSER)
set(ELF_SRCS cmELF.h cmELF.cxx)
endif()
+# Check if we can build the Mach-O parser.
+if(CMAKE_USE_MACH_PARSER)
+ set(MACH_SRCS cmMachO.h cmMachO.cxx)
+endif()
+
#
# Sources for CMakeLib
#
@@ -267,6 +276,7 @@ set(SRCS
cmLocalGenerator.cxx
cmLocalGenerator.h
cmLocalUnixMakefileGenerator3.cxx
+ ${MACH_SRCS}
cmMakeDepend.cxx
cmMakeDepend.h
cmMakefile.cxx
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 2b0280d..79776f4 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -16,5 +16,6 @@
#cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE
#cmakedefine HAVE_UNSETENV
#cmakedefine CMAKE_USE_ELF_PARSER
+#cmakedefine CMAKE_USE_MACH_PARSER
#cmakedefine CMAKE_ENCODING_UTF8
#define CMAKE_DATA_DIR /@CMAKE_DATA_DIR@
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
new file mode 100644
index 000..fab8a4d
--- /dev/null
+++ b/Source/cmMachO.cxx
@@ -0,0 +1,420 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the License);
+ see
[Cmake-commits] CMake branch, next, updated. v3.1.0-1294-gd13b3c7
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 d13b3c756347497a626a9964e6e5b8945b00fd6a (commit)
via 30b090648301ca9615482838a09cfe1de744a03d (commit)
from b0d35d9e647b105718361b62a5ca230cdec3e782 (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=d13b3c756347497a626a9964e6e5b8945b00fd6a
commit d13b3c756347497a626a9964e6e5b8945b00fd6a
Merge: b0d35d9 30b0906
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 16:21:39 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 19 16:21:39 2014 -0500
Merge topic 'macho-parser' into next
30b09064 Fix compile warnings on Linux without cmMachO.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30b090648301ca9615482838a09cfe1de744a03d
commit 30b090648301ca9615482838a09cfe1de744a03d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 14:20:42 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 19 14:20:42 2014 -0700
Fix compile warnings on Linux without cmMachO.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index ee707ec..1c8c387 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2367,6 +2367,9 @@ bool cmSystemTools::GuessLibraryInstallName(std::string
const fullPath,
{
return macho.GetInstallName(soname);
}
+#else
+ (void)fullPath;
+ (void)soname;
#endif
return false;
---
Summary of changes:
Source/cmSystemTools.cxx |3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1296-ga04d50e
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 a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66 (commit)
via f68ca6cec7956a8a152d03d760517f64d3716f94 (commit)
from d13b3c756347497a626a9964e6e5b8945b00fd6a (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=a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66
commit a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66
Merge: d13b3c7 f68ca6c
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 17:38:57 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 19 17:38:57 2014 -0500
Merge topic 'macho-parser' into next
f68ca6ce Fix compile errors when targeting 10.4 or less.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f68ca6cec7956a8a152d03d760517f64d3716f94
commit f68ca6cec7956a8a152d03d760517f64d3716f94
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 15:37:48 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 19 15:38:46 2014 -0700
Fix compile errors when targeting 10.4 or less.
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index fab8a4d..d2f07d0 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -18,6 +18,7 @@
#include mach-o/loader.h
#include mach-o/fat.h
+#include AvailabilityMacros.h
/**
@@ -400,7 +401,9 @@ bool cmMachO::GetInstallName(std::string install_name)
uint32_t lc_cmd = cmd.type(macho);
if(lc_cmd == LC_ID_DYLIB ||
lc_cmd == LC_LOAD_WEAK_DYLIB ||
+#if MAC_OS_X_VERSION_MAX_ALLOWED = 1050
lc_cmd == LC_REEXPORT_DYLIB ||
+#endif
lc_cmd == LC_LOAD_DYLIB)
{
if(sizeof(dylib_command) cmd.LoadCommand.size())
---
Summary of changes:
Source/cmMachO.cxx |3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1298-g57d720f
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 57d720f763f58ea0ab5127c590d4ce0ad9976567 (commit)
via f248cd4724f062c4821d601bebd9b99fc2ba477a (commit)
from a04d50e5ba6bdc81ce2b09d683afbc6d5e1a1a66 (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=57d720f763f58ea0ab5127c590d4ce0ad9976567
commit 57d720f763f58ea0ab5127c590d4ce0ad9976567
Merge: a04d50e f248cd4
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 17:51:10 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 19 17:51:10 2014 -0500
Merge topic 'macho-parser' into next
f248cd47 Remove LC_REEXPORT_DYLIB from logic to identify install name.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f248cd4724f062c4821d601bebd9b99fc2ba477a
commit f248cd4724f062c4821d601bebd9b99fc2ba477a
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 15:50:22 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 19 15:50:22 2014 -0700
Remove LC_REEXPORT_DYLIB from logic to identify install name.
It wasn't supposed to be there in the first place.
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index d2f07d0..e9e76fa 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -18,8 +18,6 @@
#include mach-o/loader.h
#include mach-o/fat.h
-#include AvailabilityMacros.h
-
/**
https://developer.apple.com/library/mac/documentation/
@@ -401,9 +399,6 @@ bool cmMachO::GetInstallName(std::string install_name)
uint32_t lc_cmd = cmd.type(macho);
if(lc_cmd == LC_ID_DYLIB ||
lc_cmd == LC_LOAD_WEAK_DYLIB ||
-#if MAC_OS_X_VERSION_MAX_ALLOWED = 1050
- lc_cmd == LC_REEXPORT_DYLIB ||
-#endif
lc_cmd == LC_LOAD_DYLIB)
{
if(sizeof(dylib_command) cmd.LoadCommand.size())
---
Summary of changes:
Source/cmMachO.cxx |5 -
1 file changed, 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1300-g7e07fc0
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 7e07fc027b8d409a501514a39d0df2c0d11adfd0 (commit)
via b85e9a8b0f69826ff63d2f3658ce5442b32b6896 (commit)
from 57d720f763f58ea0ab5127c590d4ce0ad9976567 (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=7e07fc027b8d409a501514a39d0df2c0d11adfd0
commit 7e07fc027b8d409a501514a39d0df2c0d11adfd0
Merge: 57d720f b85e9a8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 23:44:35 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 19 23:44:35 2014 -0500
Merge topic 'macho-parser' into next
b85e9a8b Fix compile error on some OS X machines.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b85e9a8b0f69826ff63d2f3658ce5442b32b6896
commit b85e9a8b0f69826ff63d2f3658ce5442b32b6896
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 19 21:44:07 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 19 21:44:07 2014 -0700
Fix compile error on some OS X machines.
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index e9e76fa..1607845 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -51,7 +51,8 @@ namespace {
{
return false;
}
-return fin.seekg(p);
+fin.seekg(p);
+return fin.good();
}
// read from the file and fill a data structure
---
Summary of changes:
Source/cmMachO.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-405-gc111642
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 c111642e9d01ccca9b41cdbd84b893081c10be47 (commit)
via 580b668d275e294f486da1740f8c1891a98923e0 (commit)
from b67cd9793939d61318794583811d4539a2c12b4b (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=c111642e9d01ccca9b41cdbd84b893081c10be47
commit c111642e9d01ccca9b41cdbd84b893081c10be47
Merge: b67cd97 580b668
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Nov 6 23:00:36 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Nov 6 23:00:36 2014 -0500
Merge topic 'genex-target-objects-ordering' into next
580b668d genex: Preserve order while evaluating TARGET_OBJECTS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=580b668d275e294f486da1740f8c1891a98923e0
commit 580b668d275e294f486da1740f8c1891a98923e0
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Nov 6 20:56:50 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Nov 6 20:59:07 2014 -0700
genex: Preserve order while evaluating TARGET_OBJECTS
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index c1478df..9cf3536 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1286,12 +1286,14 @@ static const struct TargetObjectsNode : public
cmGeneratorExpressionNode
std::string obj_dir = gt-ObjectDirectory;
std::string result;
const char* sep = ;
-for(std::mapcmSourceFile const*, std::string::const_iterator it
-= mapping.begin(); it != mapping.end(); ++it)
+for(std::vectorcmSourceFile const*::const_iterator it
+= objectSources.begin(); it != objectSources.end(); ++it)
{
- assert(!it-second.empty());
+ std::mapcmSourceFile const*, std::string::const_iterator map_it;
+ map_it = mapping.find(*it);
+ assert(!map_it-second.empty());
result += sep;
- std::string objFile = obj_dir + it-second;
+ std::string objFile = obj_dir + map_it-second;
cmSourceFile* sf = context-Makefile-GetOrCreateSource(objFile, true);
sf-SetObjectLibrary(tgtName);
sf-SetProperty(EXTERNAL_OBJECT, 1);
---
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-330-gbff33bd
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 bff33bd91319ca7bccb42830968cd8bd884fce73 (commit)
via e63dcb1378bb6bd6b0a76c1760c4c24c27f221e5 (commit)
via d5a373a10d530c797a00b3f7b815fa68cca24510 (commit)
from 4f111cd25372b15b7e9f6373d08559edcd7c3792 (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=bff33bd91319ca7bccb42830968cd8bd884fce73
commit bff33bd91319ca7bccb42830968cd8bd884fce73
Merge: 4f111cd e63dcb1
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Nov 5 09:28:12 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 5 09:28:12 2014 -0500
Merge topic 'encoding-curl' into next
e63dcb13 Encoding: Use encoding libcurl expects with file: urls.
d5a373a1 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e63dcb1378bb6bd6b0a76c1760c4c24c27f221e5
commit e63dcb1378bb6bd6b0a76c1760c4c24c27f221e5
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Nov 5 07:16:29 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Nov 5 07:20:21 2014 -0700
Encoding: Use encoding libcurl expects with file: urls.
For unescaped file: URLs on Windows, libcurl expects
the ANSI code page.
This fixes the CMake.FileUpload test when CMake is configured
to use UTF-8 internally with a non-ascii build directory name.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 7ebd750..b0ddff4 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -33,6 +33,7 @@
#include cmsys/Glob.hxx
#include cmsys/RegularExpression.hxx
#include cmsys/FStream.hxx
+#include cmsys/Encoding.hxx
// Table of permissions flags.
#if defined(_WIN32) !defined(__CYGWIN__)
@@ -61,6 +62,35 @@ static mode_t mode_setuid = S_ISUID;
static mode_t mode_setgid = S_ISGID;
#endif
+#if defined(WIN32) defined(CMAKE_ENCODING_UTF8)
+// libcurl doesn't support file:// urls for unicode filenames on Windows.
+// Convert string from UTF-8 to ACP if this is a file:// URL.
+static std::string fix_file_url_windows(const std::string url)
+{
+ std::string ret = url;
+ if(strncmp(url.c_str(), file://, 7) == 0)
+{
+cmsys_stl::wstring wurl = cmsys::Encoding::ToWide(url);
+if(!wurl.empty())
+ {
+ int mblen = WideCharToMultiByte(CP_ACP, 0, wurl.c_str(), -1,
+ NULL, 0, NULL, NULL);
+ if(mblen 0)
+{
+std::vectorchar chars(mblen);
+mblen = WideCharToMultiByte(CP_ACP, 0, wurl.c_str(), -1,
+ chars[0], mblen, NULL, NULL);
+if(mblen 0)
+ {
+ ret = chars[0];
+ }
+}
+ }
+}
+ return ret;
+}
+#endif
+
// cmLibraryCommand
bool cmFileCommand
::InitialPass(std::vectorstd::string const args, cmExecutionStatus )
@@ -2988,6 +3018,10 @@
cmFileCommand::HandleDownloadCommand(std::vectorstd::string const args)
return false;
}
+#if defined(WIN32) defined(CMAKE_ENCODING_UTF8)
+ url = fix_file_url_windows(url);
+#endif
+
::CURL *curl;
::curl_global_init(CURL_GLOBAL_DEFAULT);
curl = ::curl_easy_init();
@@ -3250,6 +3284,10 @@
cmFileCommand::HandleUploadCommand(std::vectorstd::string const args)
unsigned long file_size = cmsys::SystemTools::FileLength(filename.c_str());
+#if defined(WIN32) defined(CMAKE_ENCODING_UTF8)
+ url = fix_file_url_windows(url);
+#endif
+
::CURL *curl;
::curl_global_init(CURL_GLOBAL_DEFAULT);
curl = ::curl_easy_init();
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmFileCommand.cxx | 38 ++
2 files changed, 39 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-170-gdd8d437
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 dd8d4374dd1f51c634b67ad629d7afe8a12fb18f (commit)
via bd3fbf36b4da6a160d13eac37732377a9b123c6f (commit)
from 3155bf4537d145f0f06e679b16b0b6fca338fee6 (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=dd8d4374dd1f51c634b67ad629d7afe8a12fb18f
commit dd8d4374dd1f51c634b67ad629d7afe8a12fb18f
Merge: 3155bf4 bd3fbf3
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Oct 28 14:20:39 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 28 14:20:39 2014 -0400
Merge topic 'cpack-bundle-codesign' into next
bd3fbf36 CPack: Add support for code signing of bundles on MacOS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd3fbf36b4da6a160d13eac37732377a9b123c6f
commit bd3fbf36b4da6a160d13eac37732377a9b123c6f
Author: André Klitzing aklitz...@gmail.com
AuthorDate: Tue Oct 28 19:15:55 2014 +0100
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Oct 28 12:20:05 2014 -0600
CPack: Add support for code signing of bundles on MacOS
diff --git a/Modules/CPackBundle.cmake b/Modules/CPackBundle.cmake
index d8293c0..d26a0b3 100644
--- a/Modules/CPackBundle.cmake
+++ b/Modules/CPackBundle.cmake
@@ -33,6 +33,31 @@
# Path to a startup script. This is a path to an executable or script that
# will be run whenever an end-user double-clicks the generated bundle in the
# OSX Finder. Optional.
+#
+# .. variable:: CPACK_BUNDLE_APPLE_CERT_APP
+#
+# The name of your Apple supplied code signing certificate for the
application.
+# The name usually takes the form Developer ID Application: [Name] or
+# 3rd Party Mac Developer Application: [Name]. If this variable is not set
+# the application will not be signed.
+#
+# .. variable:: CPACK_BUNDLE_APPLE_ENTITLEMENTS
+#
+# The name of the plist file that contains your apple entitlements for
sandboxing
+# your application. This file is required for submission to the Mac App Store.
+#
+# .. variable:: CPACK_BUNDLE_APPLE_CODESIGN_FILES
+#
+# A list of additional files that you wish to be signed. You do not need to
+# list the main application folder, or the main executable. You should
+# list any frameworks and plugins that are included in your app bundle.
+#
+# .. variable:: CPACK_COMMAND_CODESIGN
+#
+# Path to the codesign(1) command used to sign applications with an
+# Apple cert. This variable can be used to override the automatically
+# detected command (or specify its location if the auto-detection fails
+# to find it.)
#=
# Copyright 2006-2009 Kitware, Inc.
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx
b/Source/CPack/cmCPackBundleGenerator.cxx
index 6c994f1..fbd1d21 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -39,6 +39,21 @@ int cmCPackBundleGenerator::InitializeInternal()
return 0;
}
+ if(this-GetOption(CPACK_BUNDLE_APPLE_CERT_APP))
+{
+const std::string codesign_path = cmSystemTools::FindProgram(codesign,
+ std::vectorstd::string(), false);
+
+if(codesign_path.empty())
+ {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
+Cannot locate codesign command
+ std::endl);
+ return 0;
+ }
+this-SetOptionIfNotSet(CPACK_COMMAND_CODESIGN, codesign_path.c_str());
+}
+
return this-Superclass::InitializeInternal();
}
@@ -53,7 +68,7 @@ const char*
cmCPackBundleGenerator::GetPackagingInstallPrefix()
}
//--
-int cmCPackBundleGenerator::PackageFiles()
+int cmCPackBundleGenerator::ConstructBundle()
{
// Get required arguments ...
@@ -165,6 +180,22 @@ int cmCPackBundleGenerator::PackageFiles()
cmSystemTools::SetPermissions(command_target.str().c_str(), 0777);
}
+ return 1;
+}
+
+//--
+int cmCPackBundleGenerator::PackageFiles()
+{
+ if(!this-ConstructBundle())
+{
+return 0;
+}
+
+ if(!this-SignBundle(toplevel))
+{
+return 0;
+}
+
return this-CreateDMG(toplevel, packageFileNames[0]);
}
@@ -172,3 +203,96 @@ bool
cmCPackBundleGenerator::SupportsComponentInstallation() const
{
return false;
}
+
+
+int cmCPackBundleGenerator::SignBundle(const std::string src_dir)
+{
+ const std::string cpack_apple_cert_app =
+this-GetOption(CPACK_BUNDLE_APPLE_CERT_APP)
+? this-GetOption(CPACK_BUNDLE_APPLE_CERT_APP) : ;
+
+ // codesign the application
[Cmake-commits] CMake branch, next, updated. v3.0.2-2230-ge562910
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 e562910dcba4de9de3fe5138d19609092917c881 (commit)
via 197a026cfb650939a5c1054783fbe0e83802c9e6 (commit)
from 70f065d1cbaff76b4e55b4fc6f778cc7d0b37775 (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=e562910dcba4de9de3fe5138d19609092917c881
commit e562910dcba4de9de3fe5138d19609092917c881
Merge: 70f065d 197a026
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Oct 27 19:56:10 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 27 19:56:10 2014 -0400
Merge topic 'compiler-include-encoding' into next
197a026c Fix failing StringFileTest when using unicode characters.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=197a026cfb650939a5c1054783fbe0e83802c9e6
commit 197a026cfb650939a5c1054783fbe0e83802c9e6
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Oct 27 17:53:31 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Oct 27 17:55:15 2014 -0600
Fix failing StringFileTest when using unicode characters.
Some compilers (e.g. MSVC) can have a different encoding than the build
tool.
Changing the test to not use a full include path written to a header file
by cmake.
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index e6c6152..faf3bc9 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -189,7 +189,7 @@ string(CONFIGURE ${infile} infile+-/out @ONLY)
set(infile ${infile+-/out})
# Write include file to a file
-string(REGEX REPLACE includefile ${file} outfile ${infile})
+string(REGEX REPLACE includefile Includes/Values.h outfile ${infile})
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/OutputFile.h-tmp ${outfile})
file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/OutputFile.h-tmp
${CMAKE_CURRENT_BINARY_DIR}/OutputFile.h)
---
Summary of changes:
Tests/StringFileTest/CMakeLists.txt |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-2109-g6dcdb10
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 6dcdb100fb2a6e7be359c818b03c6bd14dc52893 (commit)
via 5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d (commit)
from 14f74453d3650c52e69f56c2d088083020719422 (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=6dcdb100fb2a6e7be359c818b03c6bd14dc52893
commit 6dcdb100fb2a6e7be359c818b03c6bd14dc52893
Merge: 14f7445 5ecf990
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Oct 21 13:53:57 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 21 13:53:57 2014 -0400
Merge topic 'cuda-rpath-osx' into next
5ecf990a CUDA: Remove rpath logic outdated by CMake's own @rpath support.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d
commit 5ecf990ae8afbfcfc46b50be4680f6439e5e1c2d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Oct 21 11:40:13 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Oct 21 11:50:51 2014 -0600
CUDA: Remove rpath logic outdated by CMake's own @rpath support.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 2e2b21c..3dd975c 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -703,18 +703,6 @@ if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
else()
set(CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY})
endif()
-if(APPLE)
- # We need to add the path to cudart to the linker using rpath, since the
- # library name for the cuda libraries is prepended with @rpath.
- if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
-get_filename_component(_cuda_path_to_cudart ${CUDA_CUDARTEMU_LIBRARY}
PATH)
- else()
-get_filename_component(_cuda_path_to_cudart ${CUDA_CUDART_LIBRARY} PATH)
- endif()
- if(_cuda_path_to_cudart)
-list(APPEND CUDA_LIBRARIES -Wl,-rpath -Wl,${_cuda_path_to_cudart})
- endif()
-endif()
# 1.1 toolkit on linux doesn't appear to have a separate library on
# some platforms.
---
Summary of changes:
Modules/FindCUDA.cmake | 12
1 file changed, 12 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5683-gbc64ce4
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 bc64ce4c03a02fa7efb761eecffd4ad0ae824a14 (commit)
via 30c103d29ebe3da61239ed1d66f4e86aa34101e8 (commit)
via 98cb337e7658bb81c79ccbd3c93da87597597fda (commit)
from 8b0b5703548877b08352b1b594fce4cbda0ade3c (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=bc64ce4c03a02fa7efb761eecffd4ad0ae824a14
commit bc64ce4c03a02fa7efb761eecffd4ad0ae824a14
Merge: 8b0b570 30c103d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Oct 8 10:59:43 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 8 10:59:43 2014 -0400
Merge topic 'rpath-osx-10_6' into next
30c103d2 OSX: Warn when attempting to change runtime paths on OS X 10.5
98cb337e Revert OSX: Only enable @rpath support on OS X 10.6 or greater.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30c103d29ebe3da61239ed1d66f4e86aa34101e8
commit 30c103d29ebe3da61239ed1d66f4e86aa34101e8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Oct 6 22:24:10 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Oct 8 08:58:15 2014 -0600
OSX: Warn when attempting to change runtime paths on OS X 10.5
Even though 10.5 supports @rpath, the support is not complete
enough for CMake. For instance, install_name_tool doesn't support
adding and removing rpaths.
Also modifying BundleUtilities test to remove an undesirable cmake
generated runtime path. The intent was to build with the install
rpath as is done with the other cases in this test.
diff --git a/Source/cmInstallTargetGenerator.cxx
b/Source/cmInstallTargetGenerator.cxx
index 8a1c53e..1cb5b0f 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -688,35 +688,58 @@ cmInstallTargetGenerator
cli-GetRPath(oldRuntimeDirs, false);
cli-GetRPath(newRuntimeDirs, true);
-// Note: These paths are kept unique to avoid install_name_tool corruption.
-std::setstd::string runpaths;
-for(std::vectorstd::string::const_iterator i = oldRuntimeDirs.begin();
-i != oldRuntimeDirs.end(); ++i)
+std::string darwin_major_version_s =
+ this-Target-GetMakefile()-GetSafeDefinition(DARWIN_MAJOR_VERSION);
+
+std::stringstream ss(darwin_major_version_s);
+int darwin_major_version;
+ss darwin_major_version;
+if(!ss.fail() darwin_major_version = 9
+ (!oldRuntimeDirs.empty() || !newRuntimeDirs.empty())
+ )
{
- std::string runpath = this-Target-GetMakefile()-GetLocalGenerator()-
-GetGlobalGenerator()-ExpandCFGIntDir(*i, config);
-
- if(runpaths.find(runpath) == runpaths.end())
-{
-runpaths.insert(runpath);
-os indent execute_process(COMMAND installNameTool \n;
-os indent-delete_rpath \ runpath \\n;
-os indent\ toDestDirPath \)\n;
-}
+ cmOStringStream msg;
+ msg WARNING: Target \ this-Target-GetName()
+ \ has runtime paths which cannot be changed during install.
+ To change runtime paths, OS X version 10.6 or newer is required.
+ Therefore, runtime paths will not be changed when installing.;
+ cmSystemTools::Message(msg.str().c_str(), Warning);
}
-
-runpaths.clear();
-for(std::vectorstd::string::const_iterator i = newRuntimeDirs.begin();
-i != newRuntimeDirs.end(); ++i)
+else
{
- std::string runpath = this-Target-GetMakefile()-GetLocalGenerator()-
-GetGlobalGenerator()-ExpandCFGIntDir(*i, config);
+ // Note: These paths are kept unique to avoid
+ // install_name_tool corruption.
+ std::setstd::string runpaths;
+ for(std::vectorstd::string::const_iterator i = oldRuntimeDirs.begin();
+ i != oldRuntimeDirs.end(); ++i)
+{
+std::string runpath =
+ this-Target-GetMakefile()-GetLocalGenerator()-
+ GetGlobalGenerator()-ExpandCFGIntDir(*i, config);
- if(runpaths.find(runpath) == runpaths.end())
+if(runpaths.find(runpath) == runpaths.end())
+ {
+ runpaths.insert(runpath);
+ os indent execute_process(COMMAND installNameTool \n;
+ os indent-delete_rpath \ runpath \\n;
+ os indent\ toDestDirPath \)\n;
+ }
+}
+
+ runpaths.clear();
+ for(std::vectorstd::string::const_iterator i = newRuntimeDirs.begin();
+ i != newRuntimeDirs.end(); ++i)
{
-os indent execute_process(COMMAND installNameTool \n
[Cmake-commits] CMake branch, next, updated. v3.0.2-5694-ge5734b5
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 e5734b5b08b7e5e6376b332d9de121aa6bb38282 (commit)
via de80d7318f7e525fc4d91f85b8ee8a4345c60d53 (commit)
from 4585ef7db51d87f5082b30308bbc86c7ed8e387f (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=e5734b5b08b7e5e6376b332d9de121aa6bb38282
commit e5734b5b08b7e5e6376b332d9de121aa6bb38282
Merge: 4585ef7 de80d73
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Oct 8 12:12:48 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 8 12:12:48 2014 -0400
Merge topic 'rpath-osx-10_6' into next
de80d731 OSX: Better warning message when rpaths can't be changed at
install time.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de80d7318f7e525fc4d91f85b8ee8a4345c60d53
commit de80d7318f7e525fc4d91f85b8ee8a4345c60d53
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Oct 8 10:11:59 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Oct 8 10:11:59 2014 -0600
OSX: Better warning message when rpaths can't be changed at install time.
diff --git a/Source/cmInstallTargetGenerator.cxx
b/Source/cmInstallTargetGenerator.cxx
index 1cb5b0f..d689c89 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -677,19 +677,20 @@ cmInstallTargetGenerator
return;
}
- if(this-Target-GetMakefile()-IsOn(CMAKE_PLATFORM_HAS_INSTALLNAME))
+ cmMakefile* mf = this-Target-GetMakefile();
+
+ if(mf-IsOn(CMAKE_PLATFORM_HAS_INSTALLNAME))
{
// If using install_name_tool, set up the rules to modify the rpaths.
std::string installNameTool =
- this-Target-GetMakefile()-
- GetSafeDefinition(CMAKE_INSTALL_NAME_TOOL);
+ mf-GetSafeDefinition(CMAKE_INSTALL_NAME_TOOL);
std::vectorstd::string oldRuntimeDirs, newRuntimeDirs;
cli-GetRPath(oldRuntimeDirs, false);
cli-GetRPath(newRuntimeDirs, true);
std::string darwin_major_version_s =
- this-Target-GetMakefile()-GetSafeDefinition(DARWIN_MAJOR_VERSION);
+ mf-GetSafeDefinition(DARWIN_MAJOR_VERSION);
std::stringstream ss(darwin_major_version_s);
int darwin_major_version;
@@ -702,8 +703,10 @@ cmInstallTargetGenerator
msg WARNING: Target \ this-Target-GetName()
\ has runtime paths which cannot be changed during install.
To change runtime paths, OS X version 10.6 or newer is required.
- Therefore, runtime paths will not be changed when installing.;
- cmSystemTools::Message(msg.str().c_str(), Warning);
+ Therefore, runtime paths will not be changed when installing.
+ CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around
+this limitation.;
+ mf-IssueMessage(cmake::WARNING, msg.str());
}
else
{
@@ -714,7 +717,7 @@ cmInstallTargetGenerator
i != oldRuntimeDirs.end(); ++i)
{
std::string runpath =
- this-Target-GetMakefile()-GetLocalGenerator()-
+ mf-GetLocalGenerator()-
GetGlobalGenerator()-ExpandCFGIntDir(*i, config);
if(runpaths.find(runpath) == runpaths.end())
@@ -731,7 +734,7 @@ cmInstallTargetGenerator
i != newRuntimeDirs.end(); ++i)
{
std::string runpath =
- this-Target-GetMakefile()-GetLocalGenerator()-
+ mf-GetLocalGenerator()-
GetGlobalGenerator()-ExpandCFGIntDir(*i, config);
if(runpaths.find(runpath) == runpaths.end())
---
Summary of changes:
Source/cmInstallTargetGenerator.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5631-gff01a61
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 ff01a61060dedea83dfba83bf636dabd85d89c61 (commit)
via 36c509b9c23725a9e731b4f68a5bfb209bf3cfa1 (commit)
via b8f194732f788bb1090437100efda7695295c279 (commit)
from 05d793389215d5f80e7b4e444ecb1452250e6cbb (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=ff01a61060dedea83dfba83bf636dabd85d89c61
commit ff01a61060dedea83dfba83bf636dabd85d89c61
Merge: 05d7933 36c509b
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Oct 7 00:31:58 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Oct 7 00:31:58 2014 -0400
Merge topic 'rpath-osx-10_6' into next
36c509b9 OSX: Only enable @rpath support on OS X 10.6 or greater.
b8f19473 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36c509b9c23725a9e731b4f68a5bfb209bf3cfa1
commit 36c509b9c23725a9e731b4f68a5bfb209bf3cfa1
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Oct 6 22:24:10 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Oct 6 22:24:10 2014 -0600
OSX: Only enable @rpath support on OS X 10.6 or greater.
Even though 10.5 supports @rpath, the support is not complete
enough for CMake. For instance, install_name_tool doesn't support
adding and removing rpaths.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index e5c5f36..6a6b338 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -30,8 +30,8 @@ set(CMAKE_SHARED_MODULE_SUFFIX .so)
set(CMAKE_MODULE_EXISTS 1)
set(CMAKE_DL_LIBS )
-# Enable rpath support for 10.5 and greater where it is known to work.
-if(${DARWIN_MAJOR_VERSION} GREATER 8)
+# Enable rpath support for 10.6 and greater where it is known to work.
+if(${DARWIN_MAJOR_VERSION} GREATER 9)
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG -Wl,-rpath,)
endif()
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b476a27..cc7d38b 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3742,7 +3742,7 @@ bool cmTarget::HasMacOSXRpathInstallNameDir(const
std::string config) const
}
w without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.;
wThis could be because you are using a Mac OS X version;
-w less than 10.5 or because CMake's platform configuration is;
+w less than 10.6 or because CMake's platform configuration is;
w corrupt.;
cmake* cm = this-Makefile-GetCMakeInstance();
cm-IssueMessage(cmake::FATAL_ERROR, w.str(), this-GetBacktrace());
---
Summary of changes:
Modules/Platform/Darwin.cmake |4 ++--
Source/CMakeVersion.cmake |2 +-
Source/cmTarget.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5591-g97a3df3
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 97a3df3be710654a7f23d394eaa66c3edcda053f (commit)
via 42e39bb37d874e2bd71f982c213a5f1de5a7bf3d (commit)
from f1bc40b9c387d18dacebfa82ba7dcb3855aeb1d1 (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=97a3df3be710654a7f23d394eaa66c3edcda053f
commit 97a3df3be710654a7f23d394eaa66c3edcda053f
Merge: f1bc40b 42e39bb
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Oct 4 16:30:52 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Oct 4 16:30:52 2014 -0400
Merge topic 'encoding-fstream' into next
42e39bb3 Fix a few more places to use cmsys::[io]fstream instead of
std::fstream.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42e39bb37d874e2bd71f982c213a5f1de5a7bf3d
commit 42e39bb37d874e2bd71f982c213a5f1de5a7bf3d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Oct 4 14:19:13 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Oct 4 14:20:04 2014 -0600
Fix a few more places to use cmsys::[io]fstream instead of std::fstream.
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx
b/Source/CTest/cmCTestBatchTestHandler.cxx
index 934481b..7f966aa 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -33,8 +33,8 @@ void cmCTestBatchTestHandler::WriteBatchScript()
{
this-Script = this-CTest-GetBinaryDir()
+ /Testing/CTestBatch.txt;
- std::fstream fout;
- fout.open(this-Script.c_str(), std::ios::out);
+ cmsys::ofstream fout;
+ fout.open(this-Script.c_str());
fout #!/bin/sh\n;
for(TestMap::iterator i = this-Tests.begin(); i != this-Tests.end(); ++i)
@@ -48,7 +48,7 @@ void cmCTestBatchTestHandler::WriteBatchScript()
}
//-
-void cmCTestBatchTestHandler::WriteSrunArgs(int test, std::fstream fout)
+void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream fout)
{
cmCTestTestHandler::cmCTestTestProperties* properties =
this-Properties[test];
@@ -79,7 +79,7 @@ void cmCTestBatchTestHandler::WriteSrunArgs(int test,
std::fstream fout)
}
//-
-void cmCTestBatchTestHandler::WriteTestCommand(int test, std::fstream fout)
+void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream fout)
{
std::vectorstd::string args = this-Properties[test]-Args;
std::vectorstd::string processArgs;
diff --git a/Source/CTest/cmCTestBatchTestHandler.h
b/Source/CTest/cmCTestBatchTestHandler.h
index ab0d081..e0c6e48 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -17,6 +17,7 @@
#include cmCTestTestHandler.h
#include cmCTestMultiProcessHandler.h
#include cmCTestRunTest.h
+#include cmsys/FStream.hxx
/** \class cmCTestBatchTestHandler
* \brief run parallel ctest
@@ -30,8 +31,8 @@ public:
virtual void RunTests();
protected:
void WriteBatchScript();
- void WriteSrunArgs(int test, std::fstream fout);
- void WriteTestCommand(int test, std::fstream fout);
+ void WriteSrunArgs(int test, cmsys::ofstream fout);
+ void WriteTestCommand(int test, cmsys::ofstream fout);
void SubmitBatchScript();
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx
b/Source/CTest/cmCTestMultiProcessHandler.cxx
index b9e6721..7ba434c 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -319,8 +319,8 @@ void cmCTestMultiProcessHandler::UpdateCostData()
{
std::string fname = this-CTest-GetCostDataFile();
std::string tmpout = fname + .tmp;
- std::fstream fout;
- fout.open(tmpout.c_str(), std::ios::out);
+ cmsys::ofstream fout;
+ fout.open(tmpout.c_str());
PropertiesMap temp = this-Properties;
@@ -610,8 +610,8 @@ void cmCTestMultiProcessHandler::WriteCheckpoint(int index)
{
std::string fname = this-CTest-GetBinaryDir()
+ /Testing/Temporary/CTestCheckpoint.txt;
- std::fstream fout;
- fout.open(fname.c_str(), std::ios::app | std::ios::out);
+ cmsys::ofstream fout;
+ fout.open(fname.c_str(), std::ios::app);
fout index \n;
fout.close();
}
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index cb070cc..93ebde6 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1180,9 +1180,9 @@ cmQtAutoGenerators::WriteOldMocDefinitionsFile(
cmSystemTools::ConvertToUnixSlashes(filename);
filename += /AutomocOldMocDefinitions.cmake;
- std::fstream outfile;
+ cmsys::ofstream
[Cmake-commits] CMake branch, next, updated. v3.0.0-4761-g0fbb08b
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 0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4 (commit)
via 305c206900d7ada953e2b8de7709733f5c46cdf9 (commit)
from 0c47c2f90796aab40911b3595870801bae6ba7d7 (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=0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4
commit 0fbb08b228c1ce0cef6d4c6332d0dbcde87b03f4
Merge: 0c47c2f 305c206
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Aug 5 09:02:20 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 5 09:02:20 2014 -0400
Merge topic 'qt-automoc' into next
305c2069 Qt: Restore Qt4AndQt5Automoc test behavior.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=305c206900d7ada953e2b8de7709733f5c46cdf9
commit 305c206900d7ada953e2b8de7709733f5c46cdf9
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Aug 5 07:00:07 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Aug 5 07:00:07 2014 -0600
Qt: Restore Qt4AndQt5Automoc test behavior.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1402c95..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1201,10 +1201,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/Qt4Targets)
- endif()
-
- if((QT4_WORKS AND QT_QTGUI_FOUND) OR
- (Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) )
+if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0)
add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc
@@ -1229,6 +1226,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--test-command ${CMAKE_CTEST_COMMAND} -V
)
list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse)
+endif()
endif()
find_package(GTK2 QUIET)
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt
b/Tests/Qt4And5Automoc/CMakeLists.txt
index 7f3e81e..34c8115 100644
--- a/Tests/Qt4And5Automoc/CMakeLists.txt
+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.0.1)
project(Qt4And5Automoc)
if (QT_REVERSE_FIND_ORDER)
- find_package(Qt5Core)
- find_package(Qt4)
+ find_package(Qt5Core REQUIRED)
+ find_package(Qt4 REQUIRED)
else()
- find_package(Qt4)
- find_package(Qt5Core)
+ find_package(Qt4 REQUIRED)
+ find_package(Qt5Core REQUIRED)
endif()
set(CMAKE_AUTOMOC ON)
@@ -22,14 +22,10 @@ endmacro()
include_directories(include)
-if (${QT4_FOUND})
generate_main_file(4)
add_executable(qt4_exe ${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp AnObject.cpp
src/OtherObject.cpp)
target_link_libraries(qt4_exe Qt4::QtCore)
-endif()
-if (${QT5_FOUND})
generate_main_file(5)
add_executable(qt5_exe ${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp AnObject.cpp
src/OtherObject.cpp)
target_link_libraries(qt5_exe Qt5::Core)
-endif()
---
Summary of changes:
Tests/CMakeLists.txt|6 ++
Tests/Qt4And5Automoc/CMakeLists.txt | 12
2 files changed, 6 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4775-g7c07f54
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 7c07f54f7061bf77a809bf2890d6a89b8ae45d0f (commit)
via efe57573f6a6490506a9ef337d70d0ef7bee8cb2 (commit)
via fbd6da7452e19a289e176ca3195cbff5e9bc4ee4 (commit)
via a61c41cb4830e08403faa0bab4f4f983d5f12390 (commit)
from f9ae1e2f8eff0e8f155a98c0447526ea1760bcb3 (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=7c07f54f7061bf77a809bf2890d6a89b8ae45d0f
commit 7c07f54f7061bf77a809bf2890d6a89b8ae45d0f
Merge: f9ae1e2 efe5757
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Aug 5 09:45:07 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 5 09:45:07 2014 -0400
Merge topic 'qt-automoc' into next
efe57573 Revert Qt: Fix automoc when .h and .cpp are in different
directories.
fbd6da74 Revert Qt: Enable running automoc test with Qt4 or Qt5.
a61c41cb Revert Qt: Restore Qt4AndQt5Automoc test behavior.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efe57573f6a6490506a9ef337d70d0ef7bee8cb2
commit efe57573f6a6490506a9ef337d70d0ef7bee8cb2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Aug 5 07:44:42 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Aug 5 07:44:42 2014 -0600
Revert Qt: Fix automoc when .h and .cpp are in different directories.
This reverts commit cf4a7eb0272555119489b7eacd88eb785c496ce2.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 76edad5..d4d565c 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1830,57 +1830,30 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const
std::string absFilename,
const std::string basename =
cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
- cmsys::SystemTools::GetRealPath(absFilename.c_str()));
-
- std::vectorstd::string incPaths;
- incPaths.push_back(absPath);
- cmSystemTools::ExpandListArgument(this-MocIncludesStr, incPaths);
+ cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
- for(std::vectorstd::string::const_iterator path = incPaths.begin();
- path != incPaths.end();
- ++path)
- {
-bool found = false;
-for(std::vectorstd::string::const_iterator ext =
- headerExtensions.begin();
-ext != headerExtensions.end();
-++ext)
+ for(std::vectorstd::string::const_iterator ext = headerExtensions.begin();
+ ext != headerExtensions.end();
+ ++ext)
{
- const std::string headerName = (*path) + / + basename + . + (*ext);
-
- if (cmsys::SystemTools::FileExists(headerName.c_str()))
+const std::string headerName = absPath + basename + . + (*ext);
+if (cmsys::SystemTools::FileExists(headerName.c_str()))
{
-absHeaders.insert(headerName);
-found = true;
-break;
+ absHeaders.insert(headerName);
+ break;
}
}
-if (found)
- break;
- }
- for(std::vectorstd::string::const_iterator path = incPaths.begin();
- path != incPaths.end();
- ++path)
- {
-bool found = false;
-for(std::vectorstd::string::const_iterator ext =
- headerExtensions.begin();
-ext != headerExtensions.end();
-++ext)
+ for(std::vectorstd::string::const_iterator ext = headerExtensions.begin();
+ ext != headerExtensions.end();
+ ++ext)
{
- const std::string privateHeaderName = (*path) + / +
-basename + _p. + (*ext);
-
- if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
+const std::string privateHeaderName = absPath+basename+_p.+(*ext);
+if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
{
-absHeaders.insert(privateHeaderName);
-found = true;
-break;
+ absHeaders.insert(privateHeaderName);
+ break;
}
}
-if (found)
- break;
- }
}
diff --git a/Tests/Qt4And5Automoc/AnObject.cpp
b/Tests/Qt4And5Automoc/AnObject.cpp
deleted file mode 100644
index c1c93f1..000
--- a/Tests/Qt4And5Automoc/AnObject.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include AnObject.h
-
-void AnObject::activated() {
-}
diff --git a/Tests/Qt4And5Automoc/AnObject.h b/Tests/Qt4And5Automoc/AnObject.h
deleted file mode 100644
index b7c5409..000
--- a/Tests/Qt4And5Automoc/AnObject.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include QObject
-
-class AnObject : public QObject {
- Q_OBJECT
-public:
- AnObject() {}
-private slots
[Cmake-commits] CMake branch, next, updated. v3.0.0-4725-gaf5b825
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 af5b8256b4d3ca1b65f5f97424918e241e360213 (commit)
via 20f56fe4d4c1227a9bd1601311aaf7c07b28bbd4 (commit)
via 6e576baa2a639ed4401a35c640e20002828dac9b (commit)
from 0bb1daddaf0f450b8d040015c9135ad85fee9378 (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=af5b8256b4d3ca1b65f5f97424918e241e360213
commit af5b8256b4d3ca1b65f5f97424918e241e360213
Merge: 0bb1dad 20f56fe
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 10:17:58 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 10:17:58 2014 -0400
Merge topic 'qt-automoc' into next
20f56fe4 Qt: Enable running automoc test with Qt4 or Qt5.
6e576baa Qt: Fix automoc when .h and .cpp are in different directories.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20f56fe4d4c1227a9bd1601311aaf7c07b28bbd4
commit 20f56fe4d4c1227a9bd1601311aaf7c07b28bbd4
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 08:14:52 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 08:14:52 2014 -0600
Qt: Enable running automoc test with Qt4 or Qt5.
Previously, the automoc tests required both Qt4 and Qt5.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ca7fcdc..1402c95 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1201,7 +1201,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/Qt4Targets)
-if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0)
+ endif()
+
+ if((QT4_WORKS AND QT_QTGUI_FOUND) OR
+ (Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) )
add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc
@@ -1226,7 +1229,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--test-command ${CMAKE_CTEST_COMMAND} -V
)
list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse)
-endif()
endif()
find_package(GTK2 QUIET)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e576baa2a639ed4401a35c640e20002828dac9b
commit 6e576baa2a639ed4401a35c640e20002828dac9b
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 08:11:31 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 08:11:31 2014 -0600
Qt: Fix automoc when .h and .cpp are in different directories.
Thanks Pau Garcia i Quiles for the patch.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d4d565c..76edad5 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1830,30 +1830,57 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const
std::string absFilename,
const std::string basename =
cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
- cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
+ cmsys::SystemTools::GetRealPath(absFilename.c_str()));
- for(std::vectorstd::string::const_iterator ext = headerExtensions.begin();
- ext != headerExtensions.end();
- ++ext)
+ std::vectorstd::string incPaths;
+ incPaths.push_back(absPath);
+ cmSystemTools::ExpandListArgument(this-MocIncludesStr, incPaths);
+
+ for(std::vectorstd::string::const_iterator path = incPaths.begin();
+ path != incPaths.end();
+ ++path)
+ {
+bool found = false;
+for(std::vectorstd::string::const_iterator ext =
+ headerExtensions.begin();
+ext != headerExtensions.end();
+++ext)
{
-const std::string headerName = absPath + basename + . + (*ext);
-if (cmsys::SystemTools::FileExists(headerName.c_str()))
+ const std::string headerName = (*path) + / + basename + . + (*ext);
+
+ if (cmsys::SystemTools::FileExists(headerName.c_str()))
{
- absHeaders.insert(headerName);
- break;
+absHeaders.insert(headerName);
+found = true;
+break;
}
}
- for(std::vectorstd::string::const_iterator ext = headerExtensions.begin();
- ext != headerExtensions.end();
- ++ext)
+if (found)
+ break;
+ }
+ for(std::vectorstd::string::const_iterator path = incPaths.begin();
+ path != incPaths.end();
+ ++path)
+ {
+bool found = false
[Cmake-commits] CMake branch, next, updated. v3.0.0-4727-g4c83a4e
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 4c83a4e74d4e13307504ff681269776ef0878246 (commit)
via 8157cb2ea2247ffb5aef206e149da17dfad9a6a7 (commit)
from af5b8256b4d3ca1b65f5f97424918e241e360213 (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=4c83a4e74d4e13307504ff681269776ef0878246
commit 4c83a4e74d4e13307504ff681269776ef0878246
Merge: af5b825 8157cb2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 10:26:34 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 10:26:34 2014 -0400
Merge topic 'file-strings-encoding' into next
8157cb2e cmFileCommand: Add ENCODING option to file(STRINGS ...)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8157cb2ea2247ffb5aef206e149da17dfad9a6a7
commit 8157cb2ea2247ffb5aef206e149da17dfad9a6a7
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 08:20:19 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 08:21:42 2014 -0600
cmFileCommand: Add ENCODING option to file(STRINGS ...)
For now, UTF8 encoding support is added.
This addresses issue #10519.
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 58e3a26..5f93686 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -64,6 +64,9 @@ Parse a list of ASCII strings from ``filename`` and store
it in
``REGEX regex``
Consider only strings that match the given regular expression.
+``ENCODING encoding-type``
+ Consider strings of a given encoding. UTF8 is currently supported.
+
For example, the code
.. code-block:: cmake
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index e47365a..34c0d73 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -428,7 +428,8 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
arg_length_minimum,
arg_length_maximum,
arg__maximum,
- arg_regex };
+ arg_regex,
+ arg_encoding };
unsigned int minlen = 0;
unsigned int maxlen = 0;
int limit_input = -1;
@@ -438,6 +439,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
bool have_regex = false;
bool newline_consume = false;
bool hex_conversion_enabled = true;
+ bool utf8_encoding = false;
int arg_mode = arg_none;
for(unsigned int i=3; i args.size(); ++i)
{
@@ -475,6 +477,10 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
hex_conversion_enabled = false;
arg_mode = arg_none;
}
+else if(args[i] == ENCODING)
+ {
+ arg_mode = arg_encoding;
+ }
else if(arg_mode == arg_limit_input)
{
if(sscanf(args[i].c_str(), %d, limit_input) != 1 ||
@@ -556,6 +562,22 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
have_regex = true;
arg_mode = arg_none;
}
+else if(arg_mode == arg_encoding)
+ {
+ if(args[i] == UTF8)
+{
+utf8_encoding = true;
+}
+ else
+{
+cmOStringStream e;
+e STRINGS option ENCODING \
+ args[i] \ not recognized.;
+this-SetError(e.str());
+return false;
+}
+ arg_mode = arg_none;
+ }
else
{
cmOStringStream e;
@@ -596,11 +618,75 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
int output_size = 0;
std::vectorstd::string strings;
std::string s;
- int c;
while((!limit_count || strings.size() limit_count)
(limit_input 0 || static_castint(fin.tellg()) limit_input)
-(c = fin.get(), fin))
+fin)
{
+std::string current_str;
+
+int c = fin.get();
+
+if(c == '\r')
+ {
+ // Ignore CR character to make output always have UNIX newlines.
+ continue;
+ }
+
+else if((c = 0x20 c 0x7F) || c == '\t' ||
+(c == '\n' newline_consume))
+ {
+ // This is an ASCII character that may be part of a string.
+ // Cast added to avoid compiler warning. Cast is ok because
+ // c is guaranteed to fit in char by the above if...
+ current_str += static_castchar(c);
+ }
+else if(utf8_encoding)
+ {
+ // Check for UTF-8 encoded string (up to 4 octets)
+ static const unsigned char utf8_check_table[3][2] =
+{
+ {0xE0, 0xC0},
+ {0xF0, 0xE0},
+ {0xF8, 0xF0},
+};
+
+ // how many octets are there?
+ unsigned int num_utf8_bytes = 0;
+ for(unsigned
[Cmake-commits] CMake branch, next, updated. v3.0.0-4744-g2ce89b4
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 2ce89b454085b5432bdf05f0c86af0e3879f6c75 (commit)
via c979c60c4386b844bfe0d2dc3a8e64da1318c561 (commit)
via cf4a7eb0272555119489b7eacd88eb785c496ce2 (commit)
from 0df50f497c4c4937e882b6ea7048980e52e855d0 (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=2ce89b454085b5432bdf05f0c86af0e3879f6c75
commit 2ce89b454085b5432bdf05f0c86af0e3879f6c75
Merge: 0df50f4 c979c60
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 11:08:40 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 11:08:40 2014 -0400
Merge topic 'qt-automoc' into next
c979c60c Qt: Enable running automoc test with Qt4 or Qt5.
cf4a7eb0 Qt: Fix automoc when .h and .cpp are in different directories.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c979c60c4386b844bfe0d2dc3a8e64da1318c561
commit c979c60c4386b844bfe0d2dc3a8e64da1318c561
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 08:14:52 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 09:08:16 2014 -0600
Qt: Enable running automoc test with Qt4 or Qt5.
Previously, the automoc tests required both Qt4 and Qt5.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ca7fcdc..1402c95 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1201,7 +1201,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/Qt4Targets)
-if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0)
+ endif()
+
+ if((QT4_WORKS AND QT_QTGUI_FOUND) OR
+ (Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) )
add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc
@@ -1226,7 +1229,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--test-command ${CMAKE_CTEST_COMMAND} -V
)
list(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse)
-endif()
endif()
find_package(GTK2 QUIET)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf4a7eb0272555119489b7eacd88eb785c496ce2
commit cf4a7eb0272555119489b7eacd88eb785c496ce2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 08:11:31 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 09:08:00 2014 -0600
Qt: Fix automoc when .h and .cpp are in different directories.
Thanks Lode Leroy for the patch.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d4d565c..76edad5 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1830,30 +1830,57 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const
std::string absFilename,
const std::string basename =
cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
- cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
+ cmsys::SystemTools::GetRealPath(absFilename.c_str()));
- for(std::vectorstd::string::const_iterator ext = headerExtensions.begin();
- ext != headerExtensions.end();
- ++ext)
+ std::vectorstd::string incPaths;
+ incPaths.push_back(absPath);
+ cmSystemTools::ExpandListArgument(this-MocIncludesStr, incPaths);
+
+ for(std::vectorstd::string::const_iterator path = incPaths.begin();
+ path != incPaths.end();
+ ++path)
+ {
+bool found = false;
+for(std::vectorstd::string::const_iterator ext =
+ headerExtensions.begin();
+ext != headerExtensions.end();
+++ext)
{
-const std::string headerName = absPath + basename + . + (*ext);
-if (cmsys::SystemTools::FileExists(headerName.c_str()))
+ const std::string headerName = (*path) + / + basename + . + (*ext);
+
+ if (cmsys::SystemTools::FileExists(headerName.c_str()))
{
- absHeaders.insert(headerName);
- break;
+absHeaders.insert(headerName);
+found = true;
+break;
}
}
- for(std::vectorstd::string::const_iterator ext = headerExtensions.begin();
- ext != headerExtensions.end();
- ++ext)
+if (found)
+ break;
+ }
+ for(std::vectorstd::string::const_iterator path = incPaths.begin();
+ path != incPaths.end();
+ ++path)
+ {
+bool found = false;
+for(std
[Cmake-commits] CMake branch, next, updated. v3.0.0-4747-g7b81cf8
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 7b81cf8943c519fa76c781afdcdc54eac08b3bfb (commit)
via 556635f5eb4f20052de4c5fa84d17bfa44764520 (commit)
via 0397a7d76906b11d97380e7073dd7183353980b6 (commit)
from 2ce89b454085b5432bdf05f0c86af0e3879f6c75 (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=7b81cf8943c519fa76c781afdcdc54eac08b3bfb
commit 7b81cf8943c519fa76c781afdcdc54eac08b3bfb
Merge: 2ce89b4 556635f
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 12:53:37 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 12:53:37 2014 -0400
Merge topic 'file-strings-encoding' into next
556635f5 cmFileCommand: Add ENCODING option to file(STRINGS ...)
0397a7d7 cmFileCommand: Refactor handling for file(STRINGS ...).
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=556635f5eb4f20052de4c5fa84d17bfa44764520
commit 556635f5eb4f20052de4c5fa84d17bfa44764520
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 10:47:22 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 10:52:50 2014 -0600
cmFileCommand: Add ENCODING option to file(STRINGS ...)
For now, UTF8 encoding support is added.
This addresses issue #10519.
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 58e3a26..5f93686 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -64,6 +64,9 @@ Parse a list of ASCII strings from ``filename`` and store
it in
``REGEX regex``
Consider only strings that match the given regular expression.
+``ENCODING encoding-type``
+ Consider strings of a given encoding. UTF8 is currently supported.
+
For example, the code
.. code-block:: cmake
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index b99b1c7..34c0d73 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -428,7 +428,8 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
arg_length_minimum,
arg_length_maximum,
arg__maximum,
- arg_regex };
+ arg_regex,
+ arg_encoding };
unsigned int minlen = 0;
unsigned int maxlen = 0;
int limit_input = -1;
@@ -438,6 +439,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
bool have_regex = false;
bool newline_consume = false;
bool hex_conversion_enabled = true;
+ bool utf8_encoding = false;
int arg_mode = arg_none;
for(unsigned int i=3; i args.size(); ++i)
{
@@ -475,6 +477,10 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
hex_conversion_enabled = false;
arg_mode = arg_none;
}
+else if(args[i] == ENCODING)
+ {
+ arg_mode = arg_encoding;
+ }
else if(arg_mode == arg_limit_input)
{
if(sscanf(args[i].c_str(), %d, limit_input) != 1 ||
@@ -556,6 +562,22 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
have_regex = true;
arg_mode = arg_none;
}
+else if(arg_mode == arg_encoding)
+ {
+ if(args[i] == UTF8)
+{
+utf8_encoding = true;
+}
+ else
+{
+cmOStringStream e;
+e STRINGS option ENCODING \
+ args[i] \ not recognized.;
+this-SetError(e.str());
+return false;
+}
+ arg_mode = arg_none;
+ }
else
{
cmOStringStream e;
@@ -618,6 +640,52 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
// c is guaranteed to fit in char by the above if...
current_str += static_castchar(c);
}
+else if(utf8_encoding)
+ {
+ // Check for UTF-8 encoded string (up to 4 octets)
+ static const unsigned char utf8_check_table[3][2] =
+{
+ {0xE0, 0xC0},
+ {0xF0, 0xE0},
+ {0xF8, 0xF0},
+};
+
+ // how many octets are there?
+ unsigned int num_utf8_bytes = 0;
+ for(unsigned int j=0; num_utf8_bytes == 0 j3; j++)
+{
+if((c utf8_check_table[j][0]) == utf8_check_table[j][1])
+ num_utf8_bytes = j+2;
+}
+
+ // get subsequent octets and check that they are valid
+ for(unsigned int j=0; jnum_utf8_bytes; j++)
+{
+if(j != 0)
+ {
+ c = fin.get();
+ if(!fin || (c 0xC0) != 0x80)
+{
+fin.putback(c);
+break;
+}
+ }
+current_str += static_castchar(c
[Cmake-commits] CMake branch, next, updated. v3.0.0-4749-g6562e32
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 6562e3204db04bf6f5256b090db751d0ca9136dd (commit)
via 5493ba5ec8d5ea156c3ea8f0d1e1805a7f6dadf3 (commit)
from 7b81cf8943c519fa76c781afdcdc54eac08b3bfb (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=6562e3204db04bf6f5256b090db751d0ca9136dd
commit 6562e3204db04bf6f5256b090db751d0ca9136dd
Merge: 7b81cf8 5493ba5
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 13:31:28 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 13:31:28 2014 -0400
Merge topic 'file-strings-encoding' into next
5493ba5e cmFileCommand: Change UTF8 argument to UTF-8
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5493ba5ec8d5ea156c3ea8f0d1e1805a7f6dadf3
commit 5493ba5ec8d5ea156c3ea8f0d1e1805a7f6dadf3
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 11:30:09 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 11:30:09 2014 -0600
cmFileCommand: Change UTF8 argument to UTF-8
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 5f93686..dbc4149 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -65,7 +65,7 @@ Parse a list of ASCII strings from ``filename`` and store
it in
Consider only strings that match the given regular expression.
``ENCODING encoding-type``
- Consider strings of a given encoding. UTF8 is currently supported.
+ Consider strings of a given encoding. UTF-8 is currently supported.
For example, the code
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 34c0d73..52571e2 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -564,7 +564,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
}
else if(arg_mode == arg_encoding)
{
- if(args[i] == UTF8)
+ if(args[i] == UTF-8)
{
utf8_encoding = true;
}
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index c46bef6..2107488 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -56,7 +56,7 @@ else()
endif()
#this file has utf-8 content
-FILE(STRINGS test.utf8 infile_strings ENCODING UTF8)
+FILE(STRINGS test.utf8 infile_strings ENCODING UTF-8)
list(LENGTH infile_strings content_len)
if(content_len MATCHES 3)
message(file(STRINGS) correctly read from utf8 file [${infile_strings}])
---
Summary of changes:
Help/command/file.rst |2 +-
Source/cmFileCommand.cxx|2 +-
Tests/StringFileTest/CMakeLists.txt |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4751-gf197197
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 f1971971c9c23f1d2819d64e189ce01a15362ac4 (commit)
via 414a1b6e13766a73dd1c7618465d0bcc57a80805 (commit)
from 6562e3204db04bf6f5256b090db751d0ca9136dd (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=f1971971c9c23f1d2819d64e189ce01a15362ac4
commit f1971971c9c23f1d2819d64e189ce01a15362ac4
Merge: 6562e32 414a1b6
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 14:26:37 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 14:26:37 2014 -0400
Merge topic 'file-strings-encoding' into next
414a1b6e cmFileCommand: Fix style and compile issues.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414a1b6e13766a73dd1c7618465d0bcc57a80805
commit 414a1b6e13766a73dd1c7618465d0bcc57a80805
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 12:26:13 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 12:26:13 2014 -0600
cmFileCommand: Fix style and compile issues.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 52571e2..d55c44b 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -682,7 +682,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
c = current_str[current_str.size() - 1 - j];
fin.putback(c);
}
-current_str.clear();
+current_str = ;
}
}
diff --git a/Tests/StringFileTest/CMakeLists.txt
b/Tests/StringFileTest/CMakeLists.txt
index 2107488..683f969 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -56,7 +56,7 @@ else()
endif()
#this file has utf-8 content
-FILE(STRINGS test.utf8 infile_strings ENCODING UTF-8)
+file(STRINGS test.utf8 infile_strings ENCODING UTF-8)
list(LENGTH infile_strings content_len)
if(content_len MATCHES 3)
message(file(STRINGS) correctly read from utf8 file [${infile_strings}])
---
Summary of changes:
Source/cmFileCommand.cxx|2 +-
Tests/StringFileTest/CMakeLists.txt |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4759-g0c47c2f
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 0c47c2f90796aab40911b3595870801bae6ba7d7 (commit)
via 8c308e7ee5061e6b68c8694f618696a72042640c (commit)
from aa373eb723dc596e8b129a6b2f279df27f6d3dda (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=0c47c2f90796aab40911b3595870801bae6ba7d7
commit 0c47c2f90796aab40911b3595870801bae6ba7d7
Merge: aa373eb 8c308e7
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 21:49:11 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 4 21:49:11 2014 -0400
Merge topic 'file-strings-encoding' into next
8c308e7e cmFileCommand: Fix compile warnings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c308e7ee5061e6b68c8694f618696a72042640c
commit 8c308e7ee5061e6b68c8694f618696a72042640c
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Aug 4 19:48:35 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Aug 4 19:48:35 2014 -0600
cmFileCommand: Fix compile warnings.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index d55c44b..1325cec 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -666,7 +666,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
c = fin.get();
if(!fin || (c 0xC0) != 0x80)
{
-fin.putback(c);
+fin.putback(static_castchar(c));
break;
}
}
@@ -680,7 +680,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vectorstd::string const args)
for(unsigned int j=0; jcurrent_str.size()-1; j++)
{
c = current_str[current_str.size() - 1 - j];
- fin.putback(c);
+ fin.putback(static_castchar(c));
}
current_str = ;
}
---
Summary of changes:
Source/cmFileCommand.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4342-gbd02742
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 bd0274267f112ce43aa3f34779780026770612bd (commit) via f2fbd3c4f548e7afe4f3ab7b3fa3df2268a954ef (commit) from 4d25272e7e1682b85164434e55fadf06e16e99f8 (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=bd0274267f112ce43aa3f34779780026770612bd commit bd0274267f112ce43aa3f34779780026770612bd Merge: 4d25272 f2fbd3c Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Jul 17 10:43:25 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Jul 17 10:43:25 2014 -0400 Merge topic 'encoding-ctest-fixes' into next f2fbd3c4 Encoding: Fix build error with Sun 5.9 compiler. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2fbd3c4f548e7afe4f3ab7b3fa3df2268a954ef commit f2fbd3c4f548e7afe4f3ab7b3fa3df2268a954ef Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Jul 17 08:42:28 2014 -0600 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Thu Jul 17 08:42:28 2014 -0600 Encoding: Fix build error with Sun 5.9 compiler. diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CTestTestMemcheck/memtester.cxx.in index fd8a2a8..43c0ba7 100644 --- a/Tests/CTestTestMemcheck/memtester.cxx.in +++ b/Tests/CTestTestMemcheck/memtester.cxx.in @@ -1,6 +1,7 @@ #include cmSystemTools.h #include cmsys/Encoding.hxx #include string +#include locale.h #define RETVAL @_retval@ --- Summary of changes: Tests/CTestTestMemcheck/memtester.cxx.in |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4262-g9cfdb3b
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 9cfdb3b3a43de0366b59c18ee1dc86a24299eefd (commit)
via 5e01ee2ea9b2062969710d8eed00620bbfc61608 (commit)
from 1a1cd48d9ca07d15b854bccdf81150c50ce4a3fc (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=9cfdb3b3a43de0366b59c18ee1dc86a24299eefd
commit 9cfdb3b3a43de0366b59c18ee1dc86a24299eefd
Merge: 1a1cd48 5e01ee2
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jul 15 13:19:19 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 15 13:19:19 2014 -0400
Merge topic 'encoding-ctest-fixes' into next
5e01ee2e Encoding: Fix a few encoding problems with ctest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e01ee2ea9b2062969710d8eed00620bbfc61608
commit 5e01ee2ea9b2062969710d8eed00620bbfc61608
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jul 15 11:11:18 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Jul 15 11:12:57 2014 -0600
Encoding: Fix a few encoding problems with ctest.
This also fixes some test failures on Windows when the
name of the build directory contains non-ascii characters.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index 7c72cba..109905c 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -225,8 +225,8 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const
std::string localprefix,
std::string upload_as
= url + / + remoteprefix + cmSystemTools::GetFilenameName(*file);
- struct stat st;
- if ( ::stat(local_file.c_str(), st) )
+
+ if ( !cmSystemTools::FileExists(local_file.c_str()) )
{
cmCTestLog(this-CTest, ERROR_MESSAGE,Cannot find file:
local_file std::endl);
@@ -234,6 +234,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const
std::string localprefix,
::curl_global_cleanup();
return false;
}
+ unsigned long filelen = cmSystemTools::FileLength(local_file.c_str());
ftpfile = cmsys::SystemTools::Fopen(local_file.c_str(), rb);
*this-LogFile \tUpload file: local_file to
@@ -252,7 +253,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const
std::string localprefix,
// and give the size of the upload (optional)
::curl_easy_setopt(curl, CURLOPT_INFILESIZE,
-static_castlong(st.st_size));
+static_castlong(filelen));
// and give curl the buffer for errors
::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
@@ -466,8 +467,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const
std::string localprefix,
upload_as += md5;
}
- struct stat st;
- if ( ::stat(local_file.c_str(), st) )
+ if( !cmSystemTools::FileExists(local_file.c_str()) )
{
cmCTestLog(this-CTest, ERROR_MESSAGE,Cannot find file:
local_file std::endl);
@@ -475,11 +475,12 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const
std::string localprefix,
::curl_global_cleanup();
return false;
}
+ unsigned long filelen = cmSystemTools::FileLength(local_file.c_str());
ftpfile = cmsys::SystemTools::Fopen(local_file.c_str(), rb);
cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT,Upload file:
local_file to
- upload_as Size: st.st_size std::endl);
+ upload_as Size: filelen std::endl);
// specify target
::curl_easy_setopt(curl,CURLOPT_URL, upload_as.c_str());
@@ -489,7 +490,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const
std::string localprefix,
// and give the size of the upload (optional)
::curl_easy_setopt(curl, CURLOPT_INFILESIZE,
-static_castlong(st.st_size));
+static_castlong(filelen));
// and give curl the buffer for errors
::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in
b/Tests/CTestTestMemcheck/memtester.cxx.in
index 55a34e3..fd8a2a8 100644
--- a/Tests/CTestTestMemcheck/memtester.cxx.in
+++ b/Tests/CTestTestMemcheck/memtester.cxx.in
@@ -1,11 +1,18 @@
#include cmSystemTools.h
+#include cmsys/Encoding.hxx
#include string
#define RETVAL @_retval@
int
-main(int argc, char **argv)
+main(int ac, char **av)
{
+ setlocale(LC_CTYPE, );
+ cmsys::Encoding::CommandLineArguments args =
+cmsys::Encoding::CommandLineArguments::Main(ac, av);
+ int argc = args.argc();
+ const char* const* argv = args.argv
[Cmake-commits] CMake branch, next, updated. v3.0.0-4033-gf547928
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 f54792849a4d32c124e8a231af42873e9700cea1 (commit)
via 9571214e55cb8b86dadb26b6b1d696ef488bdd4b (commit)
via 949715f027f738cb3558b69f5288f7655945ea80 (commit)
from 76ace1c96f1112d54d3de915296b7c47b659df54 (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=f54792849a4d32c124e8a231af42873e9700cea1
commit f54792849a4d32c124e8a231af42873e9700cea1
Merge: 76ace1c 9571214
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jul 1 08:40:06 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 1 08:40:06 2014 -0400
Merge topic 'encoding-bugs' into next
9571214e Encoding: Replace some system calls with kwsys calls which handle
unicode.
949715f0 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9571214e55cb8b86dadb26b6b1d696ef488bdd4b
commit 9571214e55cb8b86dadb26b6b1d696ef488bdd4b
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jul 1 06:37:21 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Jul 1 06:38:35 2014 -0600
Encoding: Replace some system calls with kwsys calls which handle unicode.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 61c6eb3..e47365a 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3172,15 +3172,7 @@
cmFileCommand::HandleUploadCommand(std::vectorstd::string const args)
return false;
}
- struct stat st;
- if(::stat(filename.c_str(), st))
-{
-std::string errStr = UPLOAD cannot stat file ';
-errStr += filename + '.;
-this-SetError(errStr);
-fclose(fin);
-return false;
-}
+ unsigned long file_size = cmsys::SystemTools::FileLength(filename.c_str());
::CURL *curl;
::curl_global_init(CURL_GLOBAL_DEFAULT);
@@ -3270,7 +3262,7 @@
cmFileCommand::HandleUploadCommand(std::vectorstd::string const args)
// and give the size of the upload (optional)
res = ::curl_easy_setopt(curl,
-CURLOPT_INFILESIZE, static_castlong(st.st_size));
+CURLOPT_INFILESIZE, static_castlong(file_size));
check_curl_result(res, UPLOAD cannot set input file size: );
res = ::curl_easy_perform(curl);
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index ac26503..6fd6ab7 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -33,15 +33,13 @@ std::string cmTimestamp::CurrentTime(
std::string cmTimestamp::FileModificationTime(const char* path,
const std::string formatString, bool utcFlag)
{
- struct stat info;
- memset(info, 0, sizeof(info));
-
- if(stat(path, info) != 0)
+ if(!cmsys::SystemTools::FileExists(path))
{
return std::string();
}
- return CreateTimestampFromTimeT(info.st_mtime, formatString, utcFlag);
+ time_t mtime = cmsys::SystemTools::ModifiedTime(path);
+ return CreateTimestampFromTimeT(mtime, formatString, utcFlag);
}
//
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmFileCommand.cxx | 12 ++--
Source/cmTimestamp.cxx|8 +++-
3 files changed, 6 insertions(+), 16 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4026-g7243483
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 724348323c1b882f127d90df0714faedc6461804 (commit)
via d5160fd4916b98ede37446f88f504961704ffd27 (commit)
from 2f8fa2dc6c36f450c6d74be64735abca32214387 (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=724348323c1b882f127d90df0714faedc6461804
commit 724348323c1b882f127d90df0714faedc6461804
Merge: 2f8fa2d d5160fd
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 30 22:48:19 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 30 22:48:19 2014 -0400
Merge topic 'libarchive-encoding' into next
d5160fd4 Encoding: Create helper functions for some libarchive calls.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5160fd4916b98ede37446f88f504961704ffd27
commit d5160fd4916b98ede37446f88f504961704ffd27
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 30 20:46:33 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jun 30 20:46:33 2014 -0600
Encoding: Create helper functions for some libarchive calls.
These helper functions reduce the number of conditionals.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index e6a3e70..3b0ead5 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -25,6 +25,28 @@ static std::string cm_archive_error_string(struct archive* a)
}
//
+static void cm_archive_entry_copy_pathname(struct archive_entry* e,
+ const std::string dest)
+{
+#if cmsys_STL_HAS_WSTRING
+ archive_entry_copy_pathname_w(e, cmsys::Encoding::ToWide(dest).c_str());
+#else
+ archive_entry_copy_pathname(e, dest.c_str());
+#endif
+}
+
+//
+static void cm_archive_entry_copy_sourcepath(struct archive_entry* e,
+ const std::string file)
+{
+#if cmsys_STL_HAS_WSTRING
+ archive_entry_copy_sourcepath_w(e, cmsys::Encoding::ToWide(file).c_str());
+#else
+ archive_entry_copy_sourcepath(e, file.c_str());
+#endif
+}
+
+//
class cmArchiveWrite::Entry
{
struct archive_entry* Object;
@@ -237,13 +259,8 @@ bool cmArchiveWrite::AddFile(const char* file,
std::cout dest \n;
}
Entry e;
-#if cmsys_STL_HAS_WSTRING
- archive_entry_copy_sourcepath_w(e, cmsys::Encoding::ToWide(file).c_str());
- archive_entry_copy_pathname_w(e, cmsys::Encoding::ToWide(dest).c_str());
-#else
- archive_entry_copy_sourcepath(e, file);
- archive_entry_copy_pathname(e, dest.c_str());
-#endif
+ cm_archive_entry_copy_sourcepath(e, file);
+ cm_archive_entry_copy_pathname(e, dest);
if(archive_read_disk_entry_from_file(this-Disk, e, -1, 0) != ARCHIVE_OK)
{
this-Error = archive_read_disk_entry_from_file: ;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index ed0cb4c..d0fa834 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -91,6 +91,31 @@ extern char** environ;
# endif
#endif
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+static std::string
+cm_archive_entry_pathname(struct archive_entry *entry)
+{
+#if cmsys_STL_HAS_WSTRING
+ return cmsys::Encoding::ToNarrow(
+archive_entry_pathname_w(entry)).c_str();
+#else
+ return archive_entry_pathname(entry);
+#endif
+}
+
+static int cm_archive_read_open_file(struct archive* a,
+ const char* file,
+ int block_size)
+{
+#if cmsys_STL_HAS_WSTRING
+ std::wstring wfile = cmsys::Encoding::ToWide(file);
+ return archive_read_open_filename_w(a, wfile.c_str(), block_size);
+#else
+ return archive_read_open_filename(a, file, block_size);
+#endif
+}
+#endif
+
#ifdef _WIN32
class cmSystemToolsWindowsHandle
{
@@ -1581,12 +1606,7 @@ namespace{
}
strftime(tmp, sizeof(tmp), fmt, localtime(tim));
fprintf(out, %s , tmp);
-#if cmsys_STL_HAS_WSTRING
- fprintf(out, %s,
-cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
-#else
- fprintf(out, %s, archive_entry_pathname(entry));
-#endif
+ fprintf(out, %s, cm_archive_entry_pathname(entry).c_str());
/* Extra information for links. */
if (archive_entry_hardlink(entry)) /* Hard link */
@@ -1646,12 +1666,7 @@ bool extract_tar(const char* outFileName, bool verbose,
archive_read_support_compression_all(a);
archive_read_support_format_all(a);
struct archive_entry *entry;
-#if cmsys_STL_HAS_WSTRING
- std::wstring wOutFileName = cmsys::Encoding::ToWide
[Cmake-commits] CMake branch, next, updated. v3.0.0-3863-gcd57f13
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 cd57f1396212c086e59a9784b56b0b69f34be784 (commit)
via e97d3d5d5dc2689317e7f27b65257b9563487a19 (commit)
from e852f30085651294be6ea6947f31425f2ce1e63b (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=cd57f1396212c086e59a9784b56b0b69f34be784
commit cd57f1396212c086e59a9784b56b0b69f34be784
Merge: e852f30 e97d3d5
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 23 11:20:02 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 23 11:20:02 2014 -0400
Merge topic 'libarchive-encoding' into next
e97d3d5d Encoding: Fix compile errors with old gcc versions.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e97d3d5d5dc2689317e7f27b65257b9563487a19
commit e97d3d5d5dc2689317e7f27b65257b9563487a19
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 23 09:19:07 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jun 23 09:19:07 2014 -0600
Encoding: Fix compile errors with old gcc versions.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index c5fc34f..593808b 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -237,8 +237,13 @@ bool cmArchiveWrite::AddFile(const char* file,
std::cout dest \n;
}
Entry e;
+#if cmsys_STL_HAS_WSTRING
archive_entry_copy_sourcepath_w(e, cmsys::Encoding::ToWide(file).c_str());
archive_entry_copy_pathname_w(e, cmsys::Encoding::ToWide(file).c_str());
+#else
+ archive_entry_copy_sourcepath(e, file);
+ archive_entry_copy_pathname(e, file);
+#endif
if(archive_read_disk_entry_from_file(this-Disk, e, -1, 0) != ARCHIVE_OK)
{
this-Error = archive_read_disk_entry_from_file: ;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 65fdd2c..537ae8b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1581,8 +1581,12 @@ namespace{
}
strftime(tmp, sizeof(tmp), fmt, localtime(tim));
fprintf(out, %s , tmp);
+#if cmsys_STL_HAS_WSTRING
fprintf(out, %s,
cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
+#else
+ fprintf(out, %s, archive_entry_pathname(entry));
+#endif
/* Extra information for links. */
if (archive_entry_hardlink(entry)) /* Hard link */
@@ -1637,13 +1641,17 @@ long copy_data(struct archive *ar, struct archive *aw)
bool extract_tar(const char* outFileName, bool verbose,
bool extract)
{
- std::wstring wOutFileName = cmsys::Encoding::ToWide(outFileName);
struct archive* a = archive_read_new();
struct archive *ext = archive_write_disk_new();
archive_read_support_compression_all(a);
archive_read_support_format_all(a);
struct archive_entry *entry;
+#if cmsys_STL_HAS_WSTRING
+ std::wstring wOutFileName = cmsys::Encoding::ToWide(outFileName);
int r = archive_read_open_filename_w(a, wOutFileName.c_str(), 10240);
+#else
+ int r = archive_read_open_file(a, outFileName, 10240);
+#endif
if(r)
{
cmSystemTools::Error(Problem with archive_read_open_file(): ,
@@ -1668,8 +1676,12 @@ bool extract_tar(const char* outFileName, bool verbose,
if(extract)
{
cmSystemTools::Stdout(x );
+#if cmsys_STL_HAS_WSTRING
cmSystemTools::Stdout(
cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
+#else
+cmSystemTools::Stdout(archive_entry_pathname(entry));
+#endif
}
else
{
@@ -1679,8 +1691,12 @@ bool extract_tar(const char* outFileName, bool verbose,
}
else if(!extract)
{
+#if cmsys_STL_HAS_WSTRING
cmSystemTools::Stdout(
cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
+#else
+cmSystemTools::Stdout(archive_entry_pathname(entry));
+#endif
cmSystemTools::Stdout(\n);
}
if(extract)
@@ -1710,7 +1726,11 @@ bool extract_tar(const char* outFileName, bool verbose,
else if(const char* linktext = archive_entry_symlink(entry))
{
std::cerr cmake -E tar: warning: skipping symbolic link \
+#if cmsys_STL_HAS_WSTRING
cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry))
+#else
+ archive_entry_pathname(entry)
+#endif
\ - \
linktext \. std::endl;
}
@@ -1720,7 +1740,11 @@ bool extract_tar(const char* outFileName, bool verbose,
cmSystemTools::Error(Problem with archive_write_header(): ,
archive_error_string(ext));
cmSystemTools::Error
[Cmake-commits] CMake branch, next, updated. v3.0.0-3781-g58d2a05
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 58d2a0513d75a02a8013cf9c0d9da518358ff8e1 (commit)
via 042be0b38686e9ba256358c30177b4239c1d5022 (commit)
from 84a8d51fc9dad5e504ccada5bd1160aba24bce59 (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=58d2a0513d75a02a8013cf9c0d9da518358ff8e1
commit 58d2a0513d75a02a8013cf9c0d9da518358ff8e1
Merge: 84a8d51 042be0b
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jun 17 11:26:30 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 17 11:26:30 2014 -0400
Merge topic 'encoding-parse-commandline' into next
042be0b3 Encoding: Fix compile warnings from commit 38dbe69.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=042be0b38686e9ba256358c30177b4239c1d5022
commit 042be0b38686e9ba256358c30177b4239c1d5022
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jun 17 09:25:48 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Jun 17 09:26:00 2014 -0600
Encoding: Fix compile warnings from commit 38dbe69.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0fe33d1..e29e698 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -439,7 +439,7 @@ void cmSystemTools::ParseWindowsCommandLine(const char*
command,
{
arg.append(backslashes, '\\');
backslashes = 0;
- if(*c = -1 *c = 255 isspace(*c))
+ if(((*c 0x80) == 0 ) isspace(*c))
{
if(in_quotes)
{
---
Summary of changes:
Source/cmSystemTools.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3783-gce0fc37
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 ce0fc375226be1602328576c1b3a5ba2671530e5 (commit)
via b6b493a4ed662c638d2bb6c884fb42a5de214009 (commit)
from 58d2a0513d75a02a8013cf9c0d9da518358ff8e1 (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=ce0fc375226be1602328576c1b3a5ba2671530e5
commit ce0fc375226be1602328576c1b3a5ba2671530e5
Merge: 58d2a05 b6b493a
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jun 17 11:27:19 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 17 11:27:19 2014 -0400
Merge topic 'encoding-parse-commandline' into next
b6b493a4 Encoding: Fix debug asserts parsing command line options with
non-ascii chars.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6b493a4ed662c638d2bb6c884fb42a5de214009
commit b6b493a4ed662c638d2bb6c884fb42a5de214009
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 16 20:25:25 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Jun 17 09:26:42 2014 -0600
Encoding: Fix debug asserts parsing command line options with non-ascii
chars.
With MSVC, isspace() will assert with non-ascii characters.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2e417cb..e29e698 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -439,7 +439,7 @@ void cmSystemTools::ParseWindowsCommandLine(const char*
command,
{
arg.append(backslashes, '\\');
backslashes = 0;
- if(isspace(*c))
+ if(((*c 0x80) == 0 ) isspace(*c))
{
if(in_quotes)
{
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3773-g294377f
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 294377f70ba9dc12714dda998f32830ab04cd810 (commit)
via 46265beb251639a86a2bd6062c78d980c66f8e1e (commit)
from 6d94c89da1f56e08b8439f2b4377c153d8833b36 (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=294377f70ba9dc12714dda998f32830ab04cd810
commit 294377f70ba9dc12714dda998f32830ab04cd810
Merge: 6d94c89 46265be
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jun 16 22:10:02 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 16 22:10:02 2014 -0400
Merge topic 'libarchive-encoding' into next
46265beb Encoding: Fix potential encoding issues with libarchive on Windows.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46265beb251639a86a2bd6062c78d980c66f8e1e
commit 46265beb251639a86a2bd6062c78d980c66f8e1e
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Jun 12 06:46:40 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jun 16 13:58:42 2014 -0600
Encoding: Fix potential encoding issues with libarchive on Windows.
Because the 8bit string encoding in libarchive can be different than
the 8bit string encoding in CMake, change to call the wide version
of libarchive functions. They are different if CMake is configured
to use UTF-8 as the internal encoding.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 58f7573..c5fc34f 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -237,8 +237,8 @@ bool cmArchiveWrite::AddFile(const char* file,
std::cout dest \n;
}
Entry e;
- archive_entry_copy_sourcepath(e, file);
- archive_entry_set_pathname(e, dest.c_str());
+ archive_entry_copy_sourcepath_w(e, cmsys::Encoding::ToWide(file).c_str());
+ archive_entry_copy_pathname_w(e, cmsys::Encoding::ToWide(file).c_str());
if(archive_read_disk_entry_from_file(this-Disk, e, -1, 0) != ARCHIVE_OK)
{
this-Error = archive_read_disk_entry_from_file: ;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2e417cb..65fdd2c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1581,7 +1581,8 @@ namespace{
}
strftime(tmp, sizeof(tmp), fmt, localtime(tim));
fprintf(out, %s , tmp);
- fprintf(out, %s, archive_entry_pathname(entry));
+ fprintf(out, %s,
+cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
/* Extra information for links. */
if (archive_entry_hardlink(entry)) /* Hard link */
@@ -1636,12 +1637,13 @@ long copy_data(struct archive *ar, struct archive *aw)
bool extract_tar(const char* outFileName, bool verbose,
bool extract)
{
+ std::wstring wOutFileName = cmsys::Encoding::ToWide(outFileName);
struct archive* a = archive_read_new();
struct archive *ext = archive_write_disk_new();
archive_read_support_compression_all(a);
archive_read_support_format_all(a);
struct archive_entry *entry;
- int r = archive_read_open_file(a, outFileName, 10240);
+ int r = archive_read_open_filename_w(a, wOutFileName.c_str(), 10240);
if(r)
{
cmSystemTools::Error(Problem with archive_read_open_file(): ,
@@ -1666,7 +1668,8 @@ bool extract_tar(const char* outFileName, bool verbose,
if(extract)
{
cmSystemTools::Stdout(x );
-cmSystemTools::Stdout(archive_entry_pathname(entry));
+cmSystemTools::Stdout(
+ cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
}
else
{
@@ -1676,7 +1679,8 @@ bool extract_tar(const char* outFileName, bool verbose,
}
else if(!extract)
{
- cmSystemTools::Stdout(archive_entry_pathname(entry));
+ cmSystemTools::Stdout(
+cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry)).c_str());
cmSystemTools::Stdout(\n);
}
if(extract)
@@ -1706,8 +1710,9 @@ bool extract_tar(const char* outFileName, bool verbose,
else if(const char* linktext = archive_entry_symlink(entry))
{
std::cerr cmake -E tar: warning: skipping symbolic link \
- archive_entry_pathname(entry) \ - \
- linktext \. std::endl;
+ cmsys::Encoding::ToNarrow(archive_entry_pathname_w(entry))
+ \ - \
+ linktext \. std::endl;
}
#endif
else
@@ -1715,7 +1720,7 @@ bool extract_tar(const char* outFileName, bool verbose,
cmSystemTools::Error(Problem with archive_write_header
[Cmake-commits] CMake branch, next, updated. v3.0.0-3687-g6120672
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 612067216b407ee9791c79bbefc06f8e2f24e946 (commit)
via c746b00eee09a48f6a180bf4955a7b90496f12f3 (commit)
from 93f55d8f32898c524862cc398f518bbfa0954b0d (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=612067216b407ee9791c79bbefc06f8e2f24e946
commit 612067216b407ee9791c79bbefc06f8e2f24e946
Merge: 93f55d8 c746b00
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Jun 12 00:33:38 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 12 00:33:38 2014 -0400
Merge topic 'setlocale' into next
c746b00e Encoding: Change to only set LC_CTYPE to fix encoding issues with
libarchive.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c746b00eee09a48f6a180bf4955a7b90496f12f3
commit c746b00eee09a48f6a180bf4955a7b90496f12f3
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jun 11 22:27:39 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Jun 11 22:29:16 2014 -0600
Encoding: Change to only set LC_CTYPE to fix encoding issues with
libarchive.
Changing all categories with LC_ALL causes test failures in some locales.
For example, in some locales, the decimal characer could be a comma instead
of period.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index ad37c42..98c62d5 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -101,7 +101,7 @@ int cpackDefinitionArgument(const char* argument, const
char* cValue,
// this is CPack.
int main (int argc, char const* const* argv)
{
- setlocale(LC_ALL, );
+ setlocale(LC_CTYPE, );
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = args.argc();
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index a9d4d98..54f2151 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -83,7 +83,7 @@ void CMakeMessageHandler(const char* message, const char*
title, bool,
int main(int argc, char const* const* argv)
{
- setlocale(LC_ALL, );
+ setlocale(LC_CTYPE, );
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 9f9f6bb..d8540cb 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -163,7 +163,7 @@ static void cmakemainProgressCallback(const char *m, float
prog,
int main(int ac, char const* const* av)
{
- setlocale(LC_ALL, );
+ setlocale(LC_CTYPE, );
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av);
ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 0848f19..92d2df5 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -115,7 +115,7 @@ static const char * cmDocumentationOptions[][2] =
// this is a test driver program for cmCTest.
int main (int argc, char const* const* argv)
{
- setlocale(LC_ALL, );
+ setlocale(LC_CTYPE, );
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
---
Summary of changes:
Source/CPack/cpack.cxx |2 +-
Source/CursesDialog/ccmake.cxx |2 +-
Source/cmakemain.cxx |2 +-
Source/ctest.cxx |2 +-
4 files changed, 4 insertions(+), 4 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. v3.0.0-rc6-3520-ga9be142
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 a9be1425e900b7a188b77e3218e194bf8bd23d6e (commit)
via d1146117956969b534dca30bfa1fbb8547c56801 (commit)
from 3af63db0333a0ef28337f9fd4e8785fbd0a1a926 (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=a9be1425e900b7a188b77e3218e194bf8bd23d6e
commit a9be1425e900b7a188b77e3218e194bf8bd23d6e
Merge: 3af63db d114611
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jun 3 20:19:29 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 3 20:19:29 2014 -0400
Merge topic 'setlocale' into next
d1146117 Encoding: Add setlocale() to applications.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1146117956969b534dca30bfa1fbb8547c56801
commit d1146117956969b534dca30bfa1fbb8547c56801
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri May 30 21:41:48 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri May 30 21:41:48 2014 -0600
Encoding: Add setlocale() to applications.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 2aa5991..ad37c42 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -26,6 +26,7 @@
#include cmsys/CommandLineArguments.hxx
#include cmsys/SystemTools.hxx
#include cmsys/Encoding.hxx
+#include locale.h
//
static const char * cmDocumentationName[][2] =
@@ -100,6 +101,7 @@ int cpackDefinitionArgument(const char* argument, const
char* cValue,
// this is CPack.
int main (int argc, char const* const* argv)
{
+ setlocale(LC_ALL, );
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = args.argc();
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index d70bedb..a9d4d98 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -16,6 +16,7 @@
#include signal.h
#include sys/ioctl.h
+#include locale.h
#include cmCursesMainForm.h
#include cmCursesStandardIncludes.h
@@ -82,6 +83,8 @@ void CMakeMessageHandler(const char* message, const char*
title, bool,
int main(int argc, char const* const* argv)
{
+ setlocale(LC_ALL, );
+
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 77f1e4e..9f9f6bb 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -25,6 +25,7 @@
#include cmLocalGenerator.h
#include cmMakefile.h
#include cmsys/Encoding.hxx
+#include locale.h
#ifdef CMAKE_BUILD_WITH_CMAKE
//
@@ -162,6 +163,7 @@ static void cmakemainProgressCallback(const char *m, float
prog,
int main(int ac, char const* const* av)
{
+ setlocale(LC_ALL, );
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av);
ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 3eb5551..0848f19 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -19,6 +19,7 @@
#include CTest/cmCTestScriptHandler.h
#include CTest/cmCTestLaunch.h
#include cmsys/Encoding.hxx
+#include locale.h
//
static const char * cmDocumentationName[][2] =
@@ -114,6 +115,8 @@ static const char * cmDocumentationOptions[][2] =
// this is a test driver program for cmCTest.
int main (int argc, char const* const* argv)
{
+ setlocale(LC_ALL, );
+
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
---
Summary of changes:
Source/CPack/cpack.cxx |2 ++
Source/CursesDialog/ccmake.cxx |3 +++
Source/cmakemain.cxx |2 ++
Source/ctest.cxx |3 +++
4 files changed, 10 insertions(+)
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. v3.0.0-rc6-3522-g3673b15
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 3673b151f503bc49143bd01d6cb6a855dad3f972 (commit)
via 730e386291cb7aad8f532125216b2ec71d710748 (commit)
from a9be1425e900b7a188b77e3218e194bf8bd23d6e (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=3673b151f503bc49143bd01d6cb6a855dad3f972
commit 3673b151f503bc49143bd01d6cb6a855dad3f972
Merge: a9be142 730e386
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jun 3 20:28:34 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 3 20:28:34 2014 -0400
Merge topic 'setlocale' into next
730e3862 Encoding: Add setlocale() to applications.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=730e386291cb7aad8f532125216b2ec71d710748
commit 730e386291cb7aad8f532125216b2ec71d710748
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri May 30 21:41:48 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Jun 3 18:22:25 2014 -0600
Encoding: Add setlocale() to applications.
See also bug #14934 where chinese characters could not be used with cpack.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 2aa5991..ad37c42 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -26,6 +26,7 @@
#include cmsys/CommandLineArguments.hxx
#include cmsys/SystemTools.hxx
#include cmsys/Encoding.hxx
+#include locale.h
//
static const char * cmDocumentationName[][2] =
@@ -100,6 +101,7 @@ int cpackDefinitionArgument(const char* argument, const
char* cValue,
// this is CPack.
int main (int argc, char const* const* argv)
{
+ setlocale(LC_ALL, );
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = args.argc();
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index d70bedb..a9d4d98 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -16,6 +16,7 @@
#include signal.h
#include sys/ioctl.h
+#include locale.h
#include cmCursesMainForm.h
#include cmCursesStandardIncludes.h
@@ -82,6 +83,8 @@ void CMakeMessageHandler(const char* message, const char*
title, bool,
int main(int argc, char const* const* argv)
{
+ setlocale(LC_ALL, );
+
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 77f1e4e..9f9f6bb 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -25,6 +25,7 @@
#include cmLocalGenerator.h
#include cmMakefile.h
#include cmsys/Encoding.hxx
+#include locale.h
#ifdef CMAKE_BUILD_WITH_CMAKE
//
@@ -162,6 +163,7 @@ static void cmakemainProgressCallback(const char *m, float
prog,
int main(int ac, char const* const* av)
{
+ setlocale(LC_ALL, );
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av);
ac = args.argc();
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 3eb5551..0848f19 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -19,6 +19,7 @@
#include CTest/cmCTestScriptHandler.h
#include CTest/cmCTestLaunch.h
#include cmsys/Encoding.hxx
+#include locale.h
//
static const char * cmDocumentationName[][2] =
@@ -114,6 +115,8 @@ static const char * cmDocumentationOptions[][2] =
// this is a test driver program for cmCTest.
int main (int argc, char const* const* argv)
{
+ setlocale(LC_ALL, );
+
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
---
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
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2781-g6125ddd
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 6125dddec9e337338782e1bc4e0bbefb39ee3ac1 (commit)
via 5dfe9b7d5a88cf5191057a196262ced119340bda (commit)
from 493256e1d3f12b16229340576566dab864d22317 (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=6125dddec9e337338782e1bc4e0bbefb39ee3ac1
commit 6125dddec9e337338782e1bc4e0bbefb39ee3ac1
Merge: 493256e 5dfe9b7
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue May 6 11:19:46 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 6 11:19:46 2014 -0400
Merge topic 'xcode-sdkroot' into next
5dfe9b7d Xcode: Find fallback SDK if one matching the OS version doesn't
exist.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dfe9b7d5a88cf5191057a196262ced119340bda
commit 5dfe9b7d5a88cf5191057a196262ced119340bda
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Apr 29 22:46:18 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue May 6 09:18:00 2014 -0600
Xcode: Find fallback SDK if one matching the OS version doesn't exist.
For example if one installs Xcode 4.6 on OS X 10.9, it doesn't contain
a 10.9 SDK, so fallback to the next newest version which, in this case,
happens to be a 10.8 SDK.
This fixes bug #14572.
diff --git a/Modules/Platform/Darwin-Initialize.cmake
b/Modules/Platform/Darwin-Initialize.cmake
index 82c6f3d..62fb985 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -66,24 +66,39 @@ elseif(${CMAKE_GENERATOR} MATCHES Xcode
# specially named SDKs.
set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.4 u)
set(_CMAKE_OSX_SDKS_VER_SUFFIX_10.3 .9)
-if(CMAKE_OSX_DEPLOYMENT_TARGET)
- set(_CMAKE_OSX_SDKS_VER
${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
+
+# find the latest SDK
+set(_CMAKE_OSX_LATEST_SDK_VERSION 0.0)
+file(GLOB _CMAKE_OSX_SDKS RELATIVE ${_CMAKE_OSX_SDKS_DIR}
${_CMAKE_OSX_SDKS_DIR}/MacOSX*.sdk)
+foreach(_SDK ${_CMAKE_OSX_SDKS})
+ if(_SDK MATCHES MacOSX([0-9]+\\.[0-9]+)[^/]*\\.sdk AND CMAKE_MATCH_1
VERSION_GREATER ${_CMAKE_OSX_LATEST_SDK_VERSION})
+set(_CMAKE_OSX_LATEST_SDK_VERSION ${CMAKE_MATCH_1})
+ endif()
+endforeach()
+
+# pick an SDK that works
+set(_CMAKE_OSX_SYSROOT_DEFAULT)
+foreach(ver ${CMAKE_OSX_DEPLOYMENT_TARGET}
+${_CURRENT_OSX_VERSION}
+${_CMAKE_OSX_LATEST_SDK_VERSION})
+ set(_CMAKE_OSX_DEPLOYMENT_TARGET ${ver})
+ set(_CMAKE_OSX_SDKS_VER
${_CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CMAKE_OSX_DEPLOYMENT_TARGET}})
set(_CMAKE_OSX_SYSROOT_CHECK
${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk)
if(IS_DIRECTORY ${_CMAKE_OSX_SYSROOT_CHECK})
set(_CMAKE_OSX_SYSROOT_DEFAULT ${_CMAKE_OSX_SYSROOT_CHECK})
- else()
-set(_CMAKE_OSX_SDKS_VER
${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
-set(_CMAKE_OSX_SYSROOT_DEFAULT
${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk)
-message(WARNING
- CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}'
- but the matching SDK does not exist at:\n
\${_CMAKE_OSX_SYSROOT_CHECK}\\n
- Instead using SDK:\n \${_CMAKE_OSX_SYSROOT_DEFAULT}\\n
- matching the host OS X version.
- )
+break()
endif()
-else()
- set(_CMAKE_OSX_SDKS_VER
${_CURRENT_OSX_VERSION}${_CMAKE_OSX_SDKS_VER_SUFFIX_${_CURRENT_OSX_VERSION}})
- set(_CMAKE_OSX_SYSROOT_DEFAULT
${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk)
+endforeach()
+
+if(CMAKE_OSX_DEPLOYMENT_TARGET AND
+NOT CMAKE_OSX_DEPLOYMENT_TARGET VERSION_EQUAL
${_CMAKE_OSX_DEPLOYMENT_TARGET})
+ set(_CMAKE_OSX_SDKS_VER
${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
+ set(_CMAKE_OSX_SYSROOT_CHECK
${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk)
+ message(WARNING
+CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}'
+but the matching SDK does not exist at:\n
\${_CMAKE_OSX_SYSROOT_CHECK}\\n
+Instead using SDK:\n \${_CMAKE_OSX_SYSROOT_DEFAULT}\.
+)
endif()
else()
# Assume developer files are in root (such as Xcode 4.5 command-line
tools).
---
Summary of changes:
Modules/Platform/Darwin-Initialize.cmake | 43 --
1
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1623-ge083dc3
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 e083dc3056b6fb79b1a42f1a3b72f83dd87bd037 (commit)
via 480be00bfac0af72d373b5ef190ebc770a1bc7c1 (commit)
from 5578277ae0b2856066c17aa25a87e144fbac64bc (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=e083dc3056b6fb79b1a42f1a3b72f83dd87bd037
commit e083dc3056b6fb79b1a42f1a3b72f83dd87bd037
Merge: 5578277 480be00
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 31 09:15:33 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 31 09:15:33 2014 -0400
Merge topic 'cmake-gui-symlinks' into next
480be00b cmake-gui: Don't resolve symlinks with using file dialog.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480be00bfac0af72d373b5ef190ebc770a1bc7c1
commit 480be00bfac0af72d373b5ef190ebc770a1bc7c1
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Mar 29 22:39:43 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Mar 29 22:41:44 2014 -0600
cmake-gui: Don't resolve symlinks with using file dialog.
This fixes bug #14274 where a clang++ symlink was resolved to
a clang executable.
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index f62afd6..1a98cea 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -578,7 +578,8 @@ void CMakeSetupDialog::doInterrupt()
void CMakeSetupDialog::doSourceBrowse()
{
QString dir = QFileDialog::getExistingDirectory(this,
-tr(Enter Path to Source), this-SourceDirectory-text());
+tr(Enter Path to Source), this-SourceDirectory-text(),
+QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
if(!dir.isEmpty())
{
this-setSourceDirectory(dir);
@@ -608,7 +609,8 @@ void CMakeSetupDialog::updateBinaryDirectory(const QString
dir)
void CMakeSetupDialog::doBinaryBrowse()
{
QString dir = QFileDialog::getExistingDirectory(this,
-tr(Enter Path to Build), this-BinaryDirectory-currentText());
+tr(Enter Path to Build), this-BinaryDirectory-currentText(),
+QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
if(!dir.isEmpty() dir != this-BinaryDirectory-currentText())
{
this-setBinaryDirectory(dir);
diff --git a/Source/QtDialog/QCMakeWidgets.cxx
b/Source/QtDialog/QCMakeWidgets.cxx
index a0c5e17..41f98b5 100644
--- a/Source/QtDialog/QCMakeWidgets.cxx
+++ b/Source/QtDialog/QCMakeWidgets.cxx
@@ -67,7 +67,8 @@ void QCMakeFilePathEditor::chooseFile()
title = title.arg(this-Variable);
}
this-fileDialogExists(true);
- path = QFileDialog::getOpenFileName(this, title, info.absolutePath());
+ path = QFileDialog::getOpenFileName(this, title, info.absolutePath(),
+QString(), NULL, QFileDialog::DontResolveSymlinks);
this-fileDialogExists(false);
if(!path.isEmpty())
@@ -91,7 +92,8 @@ void QCMakePathEditor::chooseFile()
title = title.arg(this-Variable);
}
this-fileDialogExists(true);
- path = QFileDialog::getExistingDirectory(this, title, this-text());
+ path = QFileDialog::getExistingDirectory(this, title, this-text(),
+QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
this-fileDialogExists(false);
if(!path.isEmpty())
{
---
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx |6 --
Source/QtDialog/QCMakeWidgets.cxx|6 --
2 files changed, 8 insertions(+), 4 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. v3.0.0-rc3-1626-g8e94429
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 8e944299a246e2156292919040c2840281f12a81 (commit)
via 83934757c942672d8bea79f11e51a184b168a212 (commit)
via 4c0cc9ab9195d348ea5f1b004789ec334531bbb1 (commit)
from e083dc3056b6fb79b1a42f1a3b72f83dd87bd037 (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=8e944299a246e2156292919040c2840281f12a81
commit 8e944299a246e2156292919040c2840281f12a81
Merge: e083dc3 8393475
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 31 09:16:18 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 31 09:16:18 2014 -0400
Merge topic 'find_package-check-quiet' into next
83934757 Find*: Make find_package(.. QUIET) affect Check* modules.
4c0cc9ab Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83934757c942672d8bea79f11e51a184b168a212
commit 83934757c942672d8bea79f11e51a184b168a212
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Mar 29 20:22:54 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Mar 29 20:22:54 2014 -0600
Find*: Make find_package(.. QUIET) affect Check* modules.
Fixes issues #14812 and #14813 where find_package(OpenMP QUIET) and
find_package(Qt4 QUIET) would still print out messages when calling
check*() functions.
Also a partial fix for #14445 where building CMake
(without cmake-gui) when Qt5 is installed and Qt4 is not installed
and warnings come out of FindQt4.cmake.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 3b658ef..1cf9124 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -52,6 +52,9 @@
include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
+cmake_push_check_state()
+set(CMAKE_REQUIRED_QUIET ${BLAS_FIND_QUIETLY})
set(_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -687,4 +690,5 @@ else()
endif()
endif()
+cmake_pop_check_state()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 3883877..b479332 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -57,7 +57,11 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
if (BZIP2_FOUND)
include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_QUIET ${BZip2_FIND_QUIETLY})
CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit
BZIP2_NEED_PREFIX)
+ cmake_pop_check_state()
endif ()
mark_as_advanced(BZIP2_INCLUDE_DIR)
diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake
index 83789cc..5620661 100644
--- a/Modules/FindBacktrace.cmake
+++ b/Modules/FindBacktrace.cmake
@@ -62,6 +62,7 @@ if (NOT DEFINED Backtrace_LIBRARY)
# First, check if we already have backtrace(), e.g., in libc
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_INCLUDES ${Backtrace_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_QUIET ${Backtrace_FIND_QUIETLY})
check_symbol_exists(backtrace ${_Backtrace_HEADER_TRY}
_Backtrace_SYM_FOUND)
cmake_pop_check_state()
endif()
diff --git a/Modules/FindCups.cmake b/Modules/FindCups.cmake
index 4b55d6a..61353ca 100644
--- a/Modules/FindCups.cmake
+++ b/Modules/FindCups.cmake
@@ -36,9 +36,13 @@ find_library(CUPS_LIBRARIES NAMES cups )
if (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES AND CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE)
include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
+cmake_push_check_state()
+set(CMAKE_REQUIRED_QUIET ${Cups_FIND_QUIETLY})
# ippDeleteAttribute is new in cups-1.1.19 (and used by kdeprint)
CHECK_LIBRARY_EXISTS(cups ippDeleteAttribute
CUPS_HAS_IPP_DELETE_ATTRIBUTE)
+cmake_pop_check_state()
endif ()
if (CUPS_INCLUDE_DIR AND EXISTS ${CUPS_INCLUDE_DIR}/cups/cups.h)
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 971edb7..fa420c1 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -67,6 +67,9 @@ endif()
# default search paths.
if(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_QUIET
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1124-g96e1c8f
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 96e1c8fab1597b7c2f277b4bd79713f8d52738f3 (commit)
via 2a7dc5302d2ccf027443842c79f0ec1aee390362 (commit)
from 07b8a5bb72a92d233edc51e4ddbd5790cf53b163 (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=96e1c8fab1597b7c2f277b4bd79713f8d52738f3
commit 96e1c8fab1597b7c2f277b4bd79713f8d52738f3
Merge: 07b8a5b 2a7dc53
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 17 10:19:13 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 17 10:19:13 2014 -0400
Merge topic 'configure_file-unicode' into next
2a7dc530 Unicode: better error message for configure_file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a7dc5302d2ccf027443842c79f0ec1aee390362
commit 2a7dc5302d2ccf027443842c79f0ec1aee390362
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 17 08:18:42 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Mar 17 08:18:42 2014 -0600
Unicode: better error message for configure_file.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ebf83bd..40c34e2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3522,9 +3522,9 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
if(bom != cmsys::FStream::BOM_None
bom != cmsys::FStream::BOM_UTF8)
{
- cmSystemTools::Error(File starts with a Byte-Order-Mark
- that is not UTF-8 ,
- sinfile.c_str());
+ cmOStringStream e;
+ e File starts with a Byte-Order-Mark that is not UTF-8 sinfile;
+ this-IssueMessage(cmake::FATAL_ERROR, e.str());
return 0;
}
// rewind to copy BOM to output file
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
index 1dff60e..eb6e08f 100644
--- a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
@@ -1,5 +1,5 @@
-CMake Error: File starts with a Byte-Order-Mark that is not UTF-8
.*/configure_file/UTF16BE-BOM.txt.in
CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
- configure_file Problem configuring file
+ File starts with a Byte-Order-Mark that is not UTF-8
+ .*/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
index 85b5f83..d2c2429 100644
--- a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
@@ -1,5 +1,5 @@
-CMake Error: File starts with a Byte-Order-Mark that is not UTF-8
.*/configure_file/UTF16LE-BOM.txt.in
CMake Error at UTF16LE-BOM.cmake:2 \(configure_file\):
- configure_file Problem configuring file
+ File starts with a Byte-Order-Mark that is not UTF-8
+ .*/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
index 7eb46f5..95ff428 100644
--- a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
@@ -1,5 +1,5 @@
-CMake Error: File starts with a Byte-Order-Mark that is not UTF-8
.*/configure_file/UTF32BE-BOM.txt.in
CMake Error at UTF32BE-BOM.cmake:2 \(configure_file\):
- configure_file Problem configuring file
+ File starts with a Byte-Order-Mark that is not UTF-8
+ .*/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
index 8ea1fe9..b1d4d4a 100644
--- a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
@@ -1,5 +1,5 @@
-CMake Error: File starts with a Byte-Order-Mark that is not UTF-8
.*/configure_file/UTF32LE-BOM.txt.in
CMake Error at UTF32LE-BOM.cmake:2 \(configure_file\):
- configure_file Problem configuring file
+ File starts with a Byte-Order-Mark that is not UTF-8
+ .*/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
---
Summary of changes:
Source/cmMakefile.cxx
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1156-g537342a
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 537342a61372b0afe69d3049d5574e623f69b5b9 (commit)
via 23bed24bef6dab1b00a2349616a604eed784e197 (commit)
from 42d3675470a486c8baca906af8a13d1b8d3c829f (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=537342a61372b0afe69d3049d5574e623f69b5b9
commit 537342a61372b0afe69d3049d5574e623f69b5b9
Merge: 42d3675 23bed24
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 17 16:01:17 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 17 16:01:17 2014 -0400
Merge topic 'configure_file-unicode' into next
23bed24b Unicode: slight clarification on error message.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23bed24bef6dab1b00a2349616a604eed784e197
commit 23bed24bef6dab1b00a2349616a604eed784e197
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 17 14:00:48 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Mar 17 14:00:48 2014 -0600
Unicode: slight clarification on error message.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0e43d6e..d0e6c30 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3523,7 +3523,7 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
bom != cmsys::FStream::BOM_UTF8)
{
cmOStringStream e;
- e File starts with a Byte-Order-Mark that is not UTF-8\n
+ e File starts with a Byte-Order-Mark that is not UTF-8:\n
sinfile;
this-IssueMessage(cmake::FATAL_ERROR, e.str());
return 0;
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
index ee4bb90..5132c4d 100644
--- a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
@@ -1,5 +1,5 @@
CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
- File starts with a Byte-Order-Mark that is not UTF-8
+ File starts with a Byte-Order-Mark that is not UTF-8:
.*/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
index bf254c4..8f997bc 100644
--- a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
@@ -1,5 +1,5 @@
CMake Error at UTF16LE-BOM.cmake:2 \(configure_file\):
- File starts with a Byte-Order-Mark that is not UTF-8
+ File starts with a Byte-Order-Mark that is not UTF-8:
.*/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
index c85aa0c..12811aa 100644
--- a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
@@ -1,5 +1,5 @@
CMake Error at UTF32BE-BOM.cmake:2 \(configure_file\):
- File starts with a Byte-Order-Mark that is not UTF-8
+ File starts with a Byte-Order-Mark that is not UTF-8:
.*/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
index 67b9bc1..fa9e01a 100644
--- a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
@@ -1,5 +1,5 @@
CMake Error at UTF32LE-BOM.cmake:2 \(configure_file\):
- File starts with a Byte-Order-Mark that is not UTF-8
+ File starts with a Byte-Order-Mark that is not UTF-8:
.*/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
Call Stack \(most recent call first\):
---
Summary of changes:
Source/cmMakefile.cxx|2 +-
Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt |2 +-
Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt |2 +-
Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt |2 +-
Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt |2 +-
5 files changed, 5 insertions(+), 5 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. v3.0.0-rc1-1158-g851f20a
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 851f20abb3551f4cecca8a02977ad76364db41d9 (commit)
via 98383f802aadcd2d469c4d7543e0a2abe8c3cdb9 (commit)
from 537342a61372b0afe69d3049d5574e623f69b5b9 (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=851f20abb3551f4cecca8a02977ad76364db41d9
commit 851f20abb3551f4cecca8a02977ad76364db41d9
Merge: 537342a 98383f8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 17 16:02:38 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 17 16:02:38 2014 -0400
Merge topic 'configure_file-unicode' into next
98383f80 Unicode: check encoding of files given to configure_file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98383f802aadcd2d469c4d7543e0a2abe8c3cdb9
commit 98383f802aadcd2d469c4d7543e0a2abe8c3cdb9
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 6 22:55:07 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Mar 17 14:01:55 2014 -0600
Unicode: check encoding of files given to configure_file.
UTF-16 and UTF-32 files are rejected.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 92177c8..d0e6c30 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3518,6 +3518,20 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
return 0;
}
+cmsys::FStream::BOM bom = cmsys::FStream::ReadBOM(fin);
+if(bom != cmsys::FStream::BOM_None
+ bom != cmsys::FStream::BOM_UTF8)
+ {
+ cmOStringStream e;
+ e File starts with a Byte-Order-Mark that is not UTF-8:\n
+ sinfile;
+ this-IssueMessage(cmake::FATAL_ERROR, e.str());
+ return 0;
+ }
+// rewind to copy BOM to output file
+fin.seekg(0);
+
+
// now copy input to output and expand variables in the
// input file at the same time
std::string inLine;
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d401a93..a8726f4 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -95,6 +95,7 @@ add_RunCMake_test(TargetPolicies)
add_RunCMake_test(alias_targets)
add_RunCMake_test(interface_library)
add_RunCMake_test(no_install_prefix)
+add_RunCMake_test(configure_file)
find_package(Qt4 QUIET)
find_package(Qt5Core QUIET)
diff --git a/Tests/RunCMake/configure_file/CMakeLists.txt
b/Tests/RunCMake/configure_file/CMakeLists.txt
new file mode 100644
index 000..2897109
--- /dev/null
+++ b/Tests/RunCMake/configure_file/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.0)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/configure_file/NO-BOM.cmake
b/Tests/RunCMake/configure_file/NO-BOM.cmake
new file mode 100644
index 000..003d526
--- /dev/null
+++ b/Tests/RunCMake/configure_file/NO-BOM.cmake
@@ -0,0 +1,2 @@
+
+configure_file(NO-BOM.txt.in ${CMAKE_CURRENT_BINARY_DIR}/NO-BOM.txt)
diff --git a/Tests/RunCMake/configure_file/NO-BOM.txt.in
b/Tests/RunCMake/configure_file/NO-BOM.txt.in
new file mode 100644
index 000..557db03
--- /dev/null
+++ b/Tests/RunCMake/configure_file/NO-BOM.txt.in
@@ -0,0 +1 @@
+Hello World
diff --git a/Tests/RunCMake/configure_file/RunCMakeTest.cmake
b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
new file mode 100644
index 000..c8bfa57
--- /dev/null
+++ b/Tests/RunCMake/configure_file/RunCMakeTest.cmake
@@ -0,0 +1,8 @@
+include(RunCMake)
+
+run_cmake(NO-BOM)
+run_cmake(UTF8-BOM)
+run_cmake(UTF16LE-BOM)
+run_cmake(UTF16BE-BOM)
+run_cmake(UTF32LE-BOM)
+run_cmake(UTF32BE-BOM)
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-result.txt
b/Tests/RunCMake/configure_file/UTF16BE-BOM-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
new file mode 100644
index 000..5132c4d
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
+ File starts with a Byte-Order-Mark that is not UTF-8:
+
+.*/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM.cmake
b/Tests/RunCMake/configure_file/UTF16BE-BOM.cmake
new file mode 100644
index 000..c570742
--- /dev/null
+++ b/Tests/RunCMake/configure_file/UTF16BE
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1042-g4754b5c
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 4754b5c1d4c9d3f978297466d01187ed50a2e684 (commit)
via 4402551e623047323ca2c6901db6557de58e055f (commit)
from 56d6bd9e0d251f6c268f41647771e457bbc2729c (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=4754b5c1d4c9d3f978297466d01187ed50a2e684
commit 4754b5c1d4c9d3f978297466d01187ed50a2e684
Merge: 56d6bd9 4402551
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 09:59:01 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 09:59:01 2014 -0400
Merge topic 'unicode-vs-projects' into next
4402551e Encoding: Provide option to configure CMake to use UTF-8 encoding.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4402551e623047323ca2c6901db6557de58e055f
commit 4402551e623047323ca2c6901db6557de58e055f
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 07:54:21 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Mar 14 07:56:12 2014 -0600
Encoding: Provide option to configure CMake to use UTF-8 encoding.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f83015..b0793d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,13 @@ if(${CMake_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
endmacro()
endif()
+# option to set the internal encoding of CMake to UTF-8
+option(CMAKE_ENCODING_UTF8 Use UTF-8 encoding internally (experimental). OFF)
+mark_as_advanced(CMAKE_ENCODING_UTF8)
+if(CMAKE_ENCODING_UTF8)
+ set(KWSYS_ENCODING_DEFAULT_CODEPAGE CP_UTF8)
+endif()
+
#---
# a macro to deal with system libraries, implemented as a macro
# simply to improve readability of the main script
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 106cffc..9fb8d9a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -24,12 +24,6 @@ endif()
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
-# for windows, we can use the utf-8 code page for conversions
-# between wide and narrow strings
-if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
- set(CMAKE_ENCODING_UTF8 1)
-endif()
-
# ensure Unicode friendly APIs are used on Windows
if(WIN32)
add_definitions(-DUNICODE -D_UNICODE)
---
Summary of changes:
CMakeLists.txt|7 +++
Source/CMakeLists.txt |6 --
2 files changed, 7 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. v3.0.0-rc1-1058-g1d819f6
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 1d819f671b120b8de999f09d6e5f7221683eb3c5 (commit)
via ee8cef8725486519a7ab47eb16208d4d64e0ab99 (commit)
via 91fd99b86532dbf35d8c7396654b9beac058c8f3 (commit)
from 0aa4b514038de1f4129b79593173086264481f2b (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=1d819f671b120b8de999f09d6e5f7221683eb3c5
commit 1d819f671b120b8de999f09d6e5f7221683eb3c5
Merge: 0aa4b51 ee8cef8
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 10:49:30 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 10:49:30 2014 -0400
Merge topic 'unicode-vs-projects' into next
ee8cef87 Encoding: If configured, write Visual Studio project files as
UTF-8.
91fd99b8 Encoding: Provide option to configure CMake to use UTF-8 encoding.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee8cef8725486519a7ab47eb16208d4d64e0ab99
commit ee8cef8725486519a7ab47eb16208d4d64e0ab99
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 08:48:42 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Mar 14 08:48:42 2014 -0600
Encoding: If configured, write Visual Studio project files as UTF-8.
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index 320b440..42033c5 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -873,7 +873,8 @@ cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget
const* target)
std::string guid = this-GetGUID(pname.c_str());
fout
-?xml version=\1.0\ encoding = \Windows-1252\?\n
+?xml version=\1.0\ encoding = \
+ this-Encoding() \?\n
VisualStudioProject\n
\tProjectType=\Visual C++\\n
\tVersion=\ this-GetIDEVersion() 0\\n
@@ -1038,3 +1039,14 @@ cmIDEFlagTable const*
cmGlobalVisualStudio7Generator::GetExtraFlagTableVS7()
{
return cmVS7ExtraFlagTable;
}
+
+std::string cmGlobalVisualStudio7Generator::Encoding()
+{
+ std::ostringstream encoding;
+#ifdef CMAKE_ENCODING_UTF8
+ encoding UTF-8;
+#else
+ encoding Windows-1252;
+#endif
+ return encoding.str();
+}
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index 0d2e410..1dc709d 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -109,6 +109,9 @@ public:
virtual void FindMakeProgram(cmMakefile*);
+ // Encoding for Visual Studio files
+ virtual std::string Encoding();
+
protected:
virtual const char* GetIDEVersion() { return 7.0; }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 69c893c..2b2a471 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -1,3 +1,4 @@
+
/*
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
@@ -918,4 +919,4 @@ std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
i += config.size();
}
return tmp;
-}
+}
\ No newline at end of file
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 14ad567..52524aa 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1975,7 +1975,8 @@ cmLocalVisualStudio7Generator
cmGlobalVisualStudio7Generator* gg =
static_castcmGlobalVisualStudio7Generator *(this-GlobalGenerator);
- fout ?xml version=\1.0\ encoding = \Windows-1252\?\n
+ fout ?xml version=\1.0\ encoding = \
+gg-Encoding() \?\n
VisualStudioProject\n
\tProjectCreator=\Intel Fortran\\n
\tVersion=\ gg-GetIntelProjectVersion() \\n;
@@ -2038,7 +2039,12 @@
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream fout,
this-WriteProjectStartFortran(fout, libName, target);
return;
}
- fout ?xml version=\1.0\ encoding = \Windows-1252\?\n
+
+ cmGlobalVisualStudio7Generator* gg =
+static_castcmGlobalVisualStudio7Generator *(this-GlobalGenerator);
+
+ fout ?xml version=\1.0\ encoding = \
+gg-Encoding() \?\n
VisualStudioProject\n
\tProjectType=\Visual C++\\n;
if(this-Version == VS71)
@@ -2059,8 +2065,6 @@
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream fout,
{
keyword = Win32Proj;
}
- cmGlobalVisualStudio7Generator* gg
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1010-g47344e2
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 47344e2137ab8b5059ed017baf3dbdbcad95a5a0 (commit)
via 98692fd2c23c1eab242f89c133c12d05ee33b084 (commit)
from bd029affc891808ace5c3602d0c2223163f65d38 (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=47344e2137ab8b5059ed017baf3dbdbcad95a5a0
commit 47344e2137ab8b5059ed017baf3dbdbcad95a5a0
Merge: bd029af 98692fd
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Mar 14 00:04:53 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 00:04:53 2014 -0400
Merge topic 'unicode-vs-projects' into next
98692fd2 Encoding: If configured, write Visual Studio project files as
UTF-8.
diff --cc Source/QtDialog/CMakeSetup.cxx
index 1b04a00,e37bd9d..82fa3a3
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@@ -79,9 -79,11 +79,9 @@@ int main(int argc, char** argv
QApplication app(argc, argv);
- #if defined(KWSYS_CP_UTF8)
+ #if defined(CMAKE_ENCODING_UTF8)
QTextCodec* utf8_codec = QTextCodec::codecForName(UTF-8);
- QTextCodec::setCodecForCStrings(utf8_codec);
QTextCodec::setCodecForLocale(utf8_codec);
- QTextCodec::setCodecForTr(utf8_codec);
#endif
// clean out standard Qt paths for plugins, which we don't use anyway
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98692fd2c23c1eab242f89c133c12d05ee33b084
commit 98692fd2c23c1eab242f89c133c12d05ee33b084
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 13 06:59:49 2014 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Mar 13 21:57:16 2014 -0600
Encoding: If configured, write Visual Studio project files as UTF-8.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 966e0f6..106cffc 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -24,6 +24,17 @@ endif()
set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
+# for windows, we can use the utf-8 code page for conversions
+# between wide and narrow strings
+if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
+ set(CMAKE_ENCODING_UTF8 1)
+endif()
+
+# ensure Unicode friendly APIs are used on Windows
+if(WIN32)
+ add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
# configure the .h file
configure_file(
${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 0dd01d8..4308a4d 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -55,11 +55,6 @@ else()
endif()
endif()
-
-if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8)
- add_definitions(-DKWSYS_CP_UTF8)
-endif()
-
set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 995929e..e37bd9d 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -79,7 +79,7 @@ int main(int argc, char** argv)
QApplication app(argc, argv);
-#if defined(KWSYS_CP_UTF8)
+#if defined(CMAKE_ENCODING_UTF8)
QTextCodec* utf8_codec = QTextCodec::codecForName(UTF-8);
QTextCodec::setCodecForCStrings(utf8_codec);
QTextCodec::setCodecForLocale(utf8_codec);
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index c5e95d0..2b0280d 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -16,4 +16,5 @@
#cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE
#cmakedefine HAVE_UNSETENV
#cmakedefine CMAKE_USE_ELF_PARSER
+#cmakedefine CMAKE_ENCODING_UTF8
#define CMAKE_DATA_DIR /@CMAKE_DATA_DIR@
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index 320b440..42033c5 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -873,7 +873,8 @@ cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget
const* target)
std::string guid = this-GetGUID(pname.c_str());
fout
-?xml version=\1.0\ encoding = \Windows-1252\?\n
+?xml version=\1.0\ encoding = \
+ this-Encoding() \?\n
VisualStudioProject\n
\tProjectType=\Visual C++\\n
\tVersion=\ this-GetIDEVersion() 0\\n
@@ -1038,3 +1039,14 @@ cmIDEFlagTable const*
cmGlobalVisualStudio7Generator::GetExtraFlagTableVS7()
{
return cmVS7ExtraFlagTable;
}
+
+std::string cmGlobalVisualStudio7Generator::Encoding()
+{
+ std::ostringstream encoding;
+#ifdef CMAKE_ENCODING_UTF8
+ encoding UTF-8;
+#else
+ encoding Windows-1252;
+#endif
+ return encoding.str();
+}
diff --git a/Source
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-936-g0d26165
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 0d2616536a4815b4859ceb7770f8f7cbdaacd2f5 (commit) via c34216cf8a265b617d4422d772187e38e57647ba (commit) from f2fe9c29893e343aceaa637f2982502b8f1bbb46 (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=0d2616536a4815b4859ceb7770f8f7cbdaacd2f5 commit 0d2616536a4815b4859ceb7770f8f7cbdaacd2f5 Merge: f2fe9c2 c34216c Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Mar 12 22:51:33 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 12 22:51:33 2014 -0400 Merge topic 'unicode-cmake-gui' into next c34216cf cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c34216cf8a265b617d4422d772187e38e57647ba commit c34216cf8a265b617d4422d772187e38e57647ba Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Mar 12 20:48:46 2014 -0600 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Wed Mar 12 20:48:46 2014 -0600 cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding. Because we already call [to|from]Local8Bit() with C strings where we are supposed to, we do not need to specify UTF-8 encoding when converting C strings to QString. diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 995929e..1b04a00 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -81,9 +81,7 @@ int main(int argc, char** argv) #if defined(KWSYS_CP_UTF8) QTextCodec* utf8_codec = QTextCodec::codecForName(UTF-8); - QTextCodec::setCodecForCStrings(utf8_codec); QTextCodec::setCodecForLocale(utf8_codec); - QTextCodec::setCodecForTr(utf8_codec); #endif // clean out standard Qt paths for plugins, which we don't use anyway --- Summary of changes: Source/QtDialog/CMakeSetup.cxx |2 -- 1 file changed, 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. v3.0.0-rc1-809-gefb4d85
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 efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd (commit) via 31a8e3f5c1a1773e6bae1a0dbf87af6b58d6c5d2 (commit) from 44ccdac0d64b132610f6d82397e3f1837015ef7c (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=efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd commit efb4d8594d0afafdbe5f6d1a23bfeb380cf5edbd Merge: 44ccdac 31a8e3f Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Tue Mar 11 08:31:16 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 11 08:31:16 2014 -0400 Merge topic 'configure_file-unicode' into next 31a8e3f5 Unicode: To bootstrap error, add KWSys FStream. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31a8e3f5c1a1773e6bae1a0dbf87af6b58d6c5d2 commit 31a8e3f5c1a1773e6bae1a0dbf87af6b58d6c5d2 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Tue Mar 11 06:30:18 2014 -0600 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Tue Mar 11 06:30:18 2014 -0600 Unicode: To bootstrap error, add KWSys FStream. diff --git a/bootstrap b/bootstrap index 69dcbce..4e61f3e 100755 --- a/bootstrap +++ b/bootstrap @@ -329,6 +329,7 @@ fi KWSYS_CXX_SOURCES=\ Directory \ EncodingCXX \ + FStream \ Glob \ RegularExpression \ SystemTools --- Summary of changes: bootstrap |1 + 1 file changed, 1 insertion(+) 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. v3.0.0-rc1-801-g383f945
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 383f94597d77fc1549e88e16e7a5ddb9b752b398 (commit)
via 121b8702308ba28058c4894af0d593fe85ffee52 (commit)
from b8c8c62880718c4bfbae5ea53b6a7723a264d6bb (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=383f94597d77fc1549e88e16e7a5ddb9b752b398
commit 383f94597d77fc1549e88e16e7a5ddb9b752b398
Merge: b8c8c62 121b870
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Mar 10 23:01:38 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 10 23:01:38 2014 -0400
Merge topic 'configure_file-unicode' into next
121b8702 Unicode: check encoding of files given to configure_file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=121b8702308ba28058c4894af0d593fe85ffee52
commit 121b8702308ba28058c4894af0d593fe85ffee52
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Mar 6 22:55:07 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Mar 10 20:59:59 2014 -0600
Unicode: check encoding of files given to configure_file.
UTF-16 and UTF-32 files are rejected.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 92177c8..ebf83bd 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3518,6 +3518,19 @@ int cmMakefile::ConfigureFile(const char* infile, const
char* outfile,
return 0;
}
+cmsys::FStream::BOM bom = cmsys::FStream::ReadBOM(fin);
+if(bom != cmsys::FStream::BOM_None
+ bom != cmsys::FStream::BOM_UTF8)
+ {
+ cmSystemTools::Error(File starts with a Byte-Order-Mark
+ that is not UTF-8 ,
+ sinfile.c_str());
+ return 0;
+ }
+// rewind to copy BOM to output file
+fin.seekg(0);
+
+
// now copy input to output and expand variables in the
// input file at the same time
std::string inLine;
---
Summary of changes:
Source/cmMakefile.cxx | 13 +
1 file changed, 13 insertions(+)
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. v3.0.0-rc1-803-g6110d7b
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 6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae (commit) via 649789a736bb217f818696eae36ee6e6a2e1aa61 (commit) from 383f94597d77fc1549e88e16e7a5ddb9b752b398 (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=6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae commit 6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae Merge: 383f945 649789a Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Mon Mar 10 23:09:22 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Mar 10 23:09:22 2014 -0400 Merge topic 'unicode-cmake-gui' into next 649789a7 Unicode: cmake-gui encoding now matches KWSys encoding. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=649789a736bb217f818696eae36ee6e6a2e1aa61 commit 649789a736bb217f818696eae36ee6e6a2e1aa61 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Thu Mar 6 23:23:52 2014 -0700 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Mon Mar 10 21:08:43 2014 -0600 Unicode: cmake-gui encoding now matches KWSys encoding. A UTF-8 QTextCodec is used with QString when KWSys is configured to treat strings as UTF-8. This means QString::toLocal8Bit() will convert to UTF-8. diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 4308a4d..0dd01d8 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -55,6 +55,11 @@ else() endif() endif() + +if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8) + add_definitions(-DKWSYS_CP_UTF8) +endif() + set(SRCS AddCacheEntry.cxx AddCacheEntry.h diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 821121e..995929e 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -14,6 +14,7 @@ #include QDir #include QTranslator #include QLocale +#include QTextCodec #include QMacInstallDialog.h #include CMakeSetupDialog.h #include cmDocumentation.h @@ -78,6 +79,13 @@ int main(int argc, char** argv) QApplication app(argc, argv); +#if defined(KWSYS_CP_UTF8) + QTextCodec* utf8_codec = QTextCodec::codecForName(UTF-8); + QTextCodec::setCodecForCStrings(utf8_codec); + QTextCodec::setCodecForLocale(utf8_codec); + QTextCodec::setCodecForTr(utf8_codec); +#endif + // clean out standard Qt paths for plugins, which we don't use anyway // when creating Mac bundles, it potentially causes problems foreach(QString p, QApplication::libraryPaths()) --- Summary of changes: Source/QtDialog/CMakeLists.txt |5 + Source/QtDialog/CMakeSetup.cxx |8 2 files changed, 13 insertions(+) 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.12.2-1788-gd0bf34f
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 d0bf34f9b275f621f0b7db537aebeebce00b9494 (commit)
via b94ecab6d6540512df5e7c11deb9d168566d346f (commit)
from 8d71c7efd29d606ad11078df7e7d74de4558955e (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=d0bf34f9b275f621f0b7db537aebeebce00b9494
commit d0bf34f9b275f621f0b7db537aebeebce00b9494
Merge: 8d71c7e b94ecab
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Feb 26 13:02:51 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Feb 26 13:02:51 2014 -0500
Merge topic 'qt4-overlink' into next
b94ecab6 FindQt4: prevent overlinking when using UseQt4.cmake.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b94ecab6d6540512df5e7c11deb9d168566d346f
commit b94ecab6d6540512df5e7c11deb9d168566d346f
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Feb 26 10:53:53 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Feb 26 10:55:38 2014 -0700
FindQt4: prevent overlinking when using UseQt4.cmake.
Now it only links with the Qt libraries specified by the user,
instead of automatically including all dependencies.
Fixes #14750 and thanks to Orion Poplawski.
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake
index 7478310..cba22af 100644
--- a/Modules/UseQt4.cmake
+++ b/Modules/UseQt4.cmake
@@ -98,7 +98,9 @@ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER
QTMOTIF QTNSPLUGIN
include_directories(SYSTEM ${QT_${module}_INCLUDE_DIR})
endif(QT_INCLUDE_DIRS_NO_SYSTEM)
endif()
- set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY})
+ if(QT_USE_${module} OR QT_IS_STATIC)
+set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY})
+ endif()
set(QT_LIBRARIES_PLUGINS ${QT_LIBRARIES_PLUGINS} ${QT_${module}_PLUGINS})
if(QT_IS_STATIC)
set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
---
Summary of changes:
Modules/UseQt4.cmake |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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.12.2-7382-g1412a1f
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 1412a1fc49282af014834735c139d8986cc72e8c (commit)
via 028a5285d8ff5053fc96ea9840cb341bdf636e24 (commit)
from a7f8d7ade9911f128127073a87b04bc68cc8adc9 (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=1412a1fc49282af014834735c139d8986cc72e8c
commit 1412a1fc49282af014834735c139d8986cc72e8c
Merge: a7f8d7a 028a528
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Feb 3 09:05:13 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Feb 3 09:05:13 2014 -0500
Merge topic 'osx-rpath-unique' into next
028a5285 OS X: Make sure RPATHs are unique to avoid possible corruption.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=028a5285d8ff5053fc96ea9840cb341bdf636e24
commit 028a5285d8ff5053fc96ea9840cb341bdf636e24
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Feb 1 21:18:04 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Feb 3 07:04:54 2014 -0700
OS X: Make sure RPATHs are unique to avoid possible corruption.
When using link_directories() and including CMAKE_CFG_INTDIR,
one can end up with duplicate RPATHs in the binary which
install_name_tool cannot fix without corrupting the binary.
Also, the cmake_install.cmake file has been fixed to correctly
handle these generator specific variables.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 03486d8..a61cab1 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3032,3 +3032,10 @@ void cmGlobalGenerator::ProcessEvaluationFiles()
}
}
}
+
+//
+std::string cmGlobalGenerator::ExpandCFGIntDir(const std::string str,
+const std::string /*config*/) const
+{
+ return str;
+}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ebc2db5..753eebf 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -193,6 +193,10 @@ public:
///! What is the configurations directory variable called?
virtual const char* GetCMakeCFGIntDir() const { return .; }
+ ///! expand CFGIntDir for a configuration
+ virtual std::string ExpandCFGIntDir(const std::string str,
+ const std::string config) const;
+
/** Get whether the generator should use a script for link commands. */
bool GetUseLinkScript() const { return this-UseLinkScript; }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 42492e6..0c5f35b 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -902,3 +902,20 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
this-insert(*ti);
}
}
+
+std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
+ const std::string str,
+ const std::string config) const
+{
+ std::string replace = GetCMakeCFGIntDir();
+
+ std::string tmp = str;
+ for(std::string::size_type i = tmp.find(replace);
+ i != std::string::npos;
+ i = tmp.find(replace, i))
+{
+tmp.replace(i, replace.size(), config);
+i += config.size();
+}
+ return tmp;
+}
diff --git a/Source/cmGlobalVisualStudioGenerator.h
b/Source/cmGlobalVisualStudioGenerator.h
index eab613d..9186d65 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -84,6 +84,10 @@ public:
virtual void FindMakeProgram(cmMakefile*);
+
+ virtual std::string ExpandCFGIntDir(const std::string str,
+ const std::string config) const;
+
protected:
// Does this VS version link targets to each other if there are
// dependencies in the SLN file? This was done for VS versions
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 46c34d0..484b28f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2272,14 +2272,24 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
std::string search_paths;
std::vectorstd::string runtimeDirs;
pcli-GetRPath(runtimeDirs, false);
+// runpath dirs needs to be unique to prevent corruption
+std::setstd::string unique_dirs;
+
for(std::vectorstd::string::const_iterator i = runtimeDirs.begin();
i != runtimeDirs.end(); ++i)
{
- if(!search_paths.empty())
+ std::string runpath = *i;
+ runpath = this-ExpandCFGIntDir(runpath
[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7380-ga7f8d7a
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 a7f8d7ade9911f128127073a87b04bc68cc8adc9 (commit)
via 3b8329f5bf492e6fd6272dd83928e7e352fa0b29 (commit)
from 0f547e2dc673fcb9d42a26096eff4977d9cb6298 (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=a7f8d7ade9911f128127073a87b04bc68cc8adc9
commit a7f8d7ade9911f128127073a87b04bc68cc8adc9
Merge: 0f547e2 3b8329f
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Feb 3 09:04:40 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Feb 3 09:04:40 2014 -0500
Merge topic 'osx-rpath-unique' into next
3b8329f5 OS X: Fix bug with making unique rpaths.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b8329f5bf492e6fd6272dd83928e7e352fa0b29
commit 3b8329f5bf492e6fd6272dd83928e7e352fa0b29
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Feb 3 07:03:35 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Feb 3 07:03:35 2014 -0700
OS X: Fix bug with making unique rpaths.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 556ef05..0c5f35b 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -915,7 +915,7 @@ std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
i = tmp.find(replace, i))
{
tmp.replace(i, replace.size(), config);
-i += (config.size() - replace.size());
+i += config.size();
}
return tmp;
}
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 067de38..484b28f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3697,14 +3697,14 @@ std::string
cmGlobalXCodeGenerator::ExpandCFGIntDir(const std::string str,
i = tmp.find(replace1, i))
{
tmp.replace(i, replace1.size(), config);
-i += (config.size() - replace1.size());
+i += config.size();
}
for(std::string::size_type i = tmp.find(replace2);
i != std::string::npos;
i = tmp.find(replace2, i))
{
tmp.replace(i, replace2.size(), config);
-i += (config.size() - replace2.size());
+i += config.size();
}
return tmp;
}
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx |2 +-
Source/cmGlobalXCodeGenerator.cxx|4 ++--
2 files changed, 3 insertions(+), 3 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.12.2-7364-g19486e0
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 19486e0d4b4b8eb7ff82317c0ffda20be700a250 (commit)
via 08141a56818220e4712773df667ff8aa57f7958d (commit)
via 6385c7151631a4ac72490540fe75cb0b9ebbedf5 (commit)
from 97384edded346b7b5e92c87780e8635b71ff0549 (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=19486e0d4b4b8eb7ff82317c0ffda20be700a250
commit 19486e0d4b4b8eb7ff82317c0ffda20be700a250
Merge: 97384ed 08141a5
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Feb 1 23:23:09 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Feb 1 23:23:09 2014 -0500
Merge topic 'osx-rpath-unique' into next
08141a56 OS X: Make sure RPATHs are unique to avoid possible corruption.
6385c715 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08141a56818220e4712773df667ff8aa57f7958d
commit 08141a56818220e4712773df667ff8aa57f7958d
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Feb 1 21:18:04 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Feb 1 21:18:04 2014 -0700
OS X: Make sure RPATHs are unique to avoid possible corruption.
When using link_directories() and including CMAKE_CFG_INTDIR,
one can end up with duplicate RPATHs in the binary which
install_name_tool cannot fix without corrupting the binary.
Also, the cmake_install.cmake file has been fixed to correctly
handle these generator specific variables.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 03486d8..a61cab1 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3032,3 +3032,10 @@ void cmGlobalGenerator::ProcessEvaluationFiles()
}
}
}
+
+//
+std::string cmGlobalGenerator::ExpandCFGIntDir(const std::string str,
+const std::string /*config*/) const
+{
+ return str;
+}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ebc2db5..753eebf 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -193,6 +193,10 @@ public:
///! What is the configurations directory variable called?
virtual const char* GetCMakeCFGIntDir() const { return .; }
+ ///! expand CFGIntDir for a configuration
+ virtual std::string ExpandCFGIntDir(const std::string str,
+ const std::string config) const;
+
/** Get whether the generator should use a script for link commands. */
bool GetUseLinkScript() const { return this-UseLinkScript; }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 42492e6..556ef05 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -902,3 +902,20 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
this-insert(*ti);
}
}
+
+std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
+ const std::string str,
+ const std::string config) const
+{
+ std::string replace = GetCMakeCFGIntDir();
+
+ std::string tmp = str;
+ for(std::string::size_type i = tmp.find(replace);
+ i != std::string::npos;
+ i = tmp.find(replace, i))
+{
+tmp.replace(i, replace.size(), config);
+i += (config.size() - replace.size());
+}
+ return tmp;
+}
diff --git a/Source/cmGlobalVisualStudioGenerator.h
b/Source/cmGlobalVisualStudioGenerator.h
index eab613d..9186d65 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -84,6 +84,10 @@ public:
virtual void FindMakeProgram(cmMakefile*);
+
+ virtual std::string ExpandCFGIntDir(const std::string str,
+ const std::string config) const;
+
protected:
// Does this VS version link targets to each other if there are
// dependencies in the SLN file? This was done for VS versions
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 46c34d0..067de38 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2272,14 +2272,24 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
std::string search_paths;
std::vectorstd::string runtimeDirs;
pcli-GetRPath(runtimeDirs, false);
+// runpath dirs needs to be unique to prevent corruption
+std::setstd::string unique_dirs;
+
for(std::vectorstd::string::const_iterator i = runtimeDirs.begin();
i != runtimeDirs.end(); ++i
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7189-gdd6dc19
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 dd6dc19ce99a880ea78e3b78f9dfca3dc806c4d4 (commit)
via 5d6501821f3a1553f61a89946be35507fdc533aa (commit)
from f9de1bda8571bd21f3527f31b80932603bc8e660 (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=dd6dc19ce99a880ea78e3b78f9dfca3dc806c4d4
commit dd6dc19ce99a880ea78e3b78f9dfca3dc806c4d4
Merge: f9de1bd 5d65018
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 20 14:11:27 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jan 20 14:11:27 2014 -0500
Merge topic 'osx-rpath-link-dirs' into next
5d650182 Revert OSX: Do not add link directories to rpaths.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d6501821f3a1553f61a89946be35507fdc533aa
commit 5d6501821f3a1553f61a89946be35507fdc533aa
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon Jan 20 12:10:19 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 20 12:10:19 2014 -0700
Revert OSX: Do not add link directories to rpaths.
This reverts commit b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49.
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 34335d2..6986965 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -375,11 +375,8 @@ cmComputeLinkInformation
// Add the search path entries requested by the user to path ordering.
this-OrderLinkerSearchPath
-AddUserDirectories(this-Target-GetLinkDirectories());
- if(!this-Makefile-IsOn(CMAKE_PLATFORM_HAS_INSTALLNAME))
-{
-this-OrderRuntimeSearchPath
- -AddUserDirectories(this-Target-GetLinkDirectories());
-}
+ this-OrderRuntimeSearchPath
+-AddUserDirectories(this-Target-GetLinkDirectories());
// Set up the implicit link directories.
this-LoadImplicitLinkInfo();
---
Summary of changes:
Source/cmComputeLinkInformation.cxx |7 ++-
1 file changed, 2 insertions(+), 5 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.12.1-7175-g3117b63
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 3117b63ec9e99505477285c59f84146b5fb8cbc1 (commit)
via b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49 (commit)
via 434fe2baa2acb47605b2354f0c5e5a9513930b05 (commit)
from d2be1570409c4ad067ce63a8a34d2b2a54fb717f (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=3117b63ec9e99505477285c59f84146b5fb8cbc1
commit 3117b63ec9e99505477285c59f84146b5fb8cbc1
Merge: d2be157 b9e8ff4
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jan 18 15:11:55 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 18 15:11:55 2014 -0500
Merge topic 'osx-rpath-link-dirs' into next
b9e8ff4d OSX: Do not add link directories to rpaths.
434fe2ba CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49
commit b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jan 18 13:01:14 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Jan 18 13:07:00 2014 -0700
OSX: Do not add link directories to rpaths.
On Mac OS X, which rpaths to add to a target should be derived from
dependent
targets that have an install name using @rpath. This can be derived if
CMake is given the full path to the library.
Because we need to be restrictive, do not add rpaths for directories
given with link_directories().
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 6986965..34335d2 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -375,8 +375,11 @@ cmComputeLinkInformation
// Add the search path entries requested by the user to path ordering.
this-OrderLinkerSearchPath
-AddUserDirectories(this-Target-GetLinkDirectories());
- this-OrderRuntimeSearchPath
--AddUserDirectories(this-Target-GetLinkDirectories());
+ if(!this-Makefile-IsOn(CMAKE_PLATFORM_HAS_INSTALLNAME))
+{
+this-OrderRuntimeSearchPath
+ -AddUserDirectories(this-Target-GetLinkDirectories());
+}
// Set up the implicit link directories.
this-LoadImplicitLinkInfo();
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmComputeLinkInformation.cxx |7 +--
2 files changed, 6 insertions(+), 3 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.12.1-7114-g429cd41
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 429cd41aaec5722de52c59369b55e1ff93aaaf7b (commit)
via 9a48b019541b7c32faa062fdea0c4ea8910d0b60 (commit)
from 8c325469e1bc003e6908b0ac6607994487f9bbc3 (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=429cd41aaec5722de52c59369b55e1ff93aaaf7b
commit 429cd41aaec5722de52c59369b55e1ff93aaaf7b
Merge: 8c32546 9a48b01
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jan 15 10:04:09 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 15 10:04:09 2014 -0500
Merge topic 'var-type-autofill' into next
9a48b019 cmake-gui: Fix compile warning.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a48b019541b7c32faa062fdea0c4ea8910d0b60
commit 9a48b019541b7c32faa062fdea0c4ea8910d0b60
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jan 15 08:03:33 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Jan 15 08:03:33 2014 -0700
cmake-gui: Fix compile warning.
diff --git a/Source/QtDialog/AddCacheEntry.cxx
b/Source/QtDialog/AddCacheEntry.cxx
index 68635d8..3881045 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -100,10 +100,10 @@ void AddCacheEntry::onCompletionActivated(const QString
text)
int idx = this-VarNames.indexOf(text);
if (idx != -1)
{
-QString type = this-VarTypes[idx];
+QString vartype = this-VarTypes[idx];
for (int i = 0; i NumTypes; i++)
{
-if (TypeStrings[i] == type)
+if (TypeStrings[i] == vartype)
{
this-Type-setCurrentIndex(i);
break;
---
Summary of changes:
Source/QtDialog/AddCacheEntry.cxx |4 ++--
1 file changed, 2 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.12.1-7104-g3102e29
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 3102e2914eec3e34afb2e447ec1b47a3c5ad1902 (commit)
via d5c68610c244a292a92034203c246f904be9324f (commit)
from b3313b18fb2bf70af783f61201e730214692831b (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=3102e2914eec3e34afb2e447ec1b47a3c5ad1902
commit 3102e2914eec3e34afb2e447ec1b47a3c5ad1902
Merge: b3313b1 d5c6861
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jan 14 17:08:06 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jan 14 17:08:06 2014 -0500
Merge topic 'var-type-autofill' into next
d5c68610 Keep variable names and types in separate lists
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5c68610c244a292a92034203c246f904be9324f
commit d5c68610c244a292a92034203c246f904be9324f
Author: Sergey Zolotarev sr...@yandex.com
AuthorDate: Tue Jan 14 01:59:37 2014 +0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Jan 14 15:06:37 2014 -0700
Keep variable names and types in separate lists
This removes the :TYPE string from completion list and the Name field
and makes variable search easier. The variable names and types are now
kept in two different settings - AddVariableNames and AddVariableTypes.
The old AddVariableCompletionEntries setting is ignored.
diff --git a/Source/QtDialog/AddCacheEntry.cxx
b/Source/QtDialog/AddCacheEntry.cxx
index aa79bbd..68635d8 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -22,8 +22,9 @@ static const QCMakeProperty::PropertyType Types[NumTypes] =
{ QCMakeProperty::BOOL, QCMakeProperty::PATH,
QCMakeProperty::FILEPATH, QCMakeProperty::STRING};
-AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList completions)
- : QWidget(p)
+AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList varNames,
+ const QStringList varTypes)
+ : QWidget(p), VarNames(varNames), VarTypes(varTypes)
{
this-setupUi(this);
for(int i=0; iNumTypes; i++)
@@ -44,7 +45,7 @@ AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList
completions)
this-setTabOrder(path, filepath);
this-setTabOrder(filepath, string);
this-setTabOrder(string, this-Description);
- QCompleter *completer = new QCompleter(completions, this);
+ QCompleter *completer = new QCompleter(this-VarNames, this);
this-Name-setCompleter(completer);
connect(completer, SIGNAL(activated(const QString)),
this, SLOT(onCompletionActivated(const QString)));
@@ -96,10 +97,10 @@ QString AddCacheEntry::typeString() const
void AddCacheEntry::onCompletionActivated(const QString text)
{
- int pos = text.lastIndexOf(':');
- if (pos != -1)
+ int idx = this-VarNames.indexOf(text);
+ if (idx != -1)
{
-QString type = text.mid(pos + 1, text.length() - pos).toUpper();
+QString type = this-VarTypes[idx];
for (int i = 0; i NumTypes; i++)
{
if (TypeStrings[i] == type)
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index a491cec..38c3a74 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -24,7 +24,8 @@ class AddCacheEntry : public QWidget, public Ui::AddCacheEntry
{
Q_OBJECT
public:
- AddCacheEntry(QWidget* p, const QStringList completions);
+ AddCacheEntry(QWidget* p, const QStringList varNames,
+const QStringList varTypes);
QString name() const;
QVariant value() const;
@@ -34,6 +35,10 @@ public:
private slots:
void onCompletionActivated(const QString text);
+
+private:
+ const QStringList VarNames;
+ const QStringList VarTypes;
};
#endif
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index 3af69b0..f62afd6 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -70,8 +70,10 @@ CMakeSetupDialog::CMakeSetupDialog()
restoreGeometry(settings.value(geometry).toByteArray());
restoreState(settings.value(windowState).toByteArray());
- this-AddVariableCompletions = settings.value(AddVariableCompletionEntries,
- QStringList(CMAKE_INSTALL_PREFIX:PATH)).toStringList();
+ this-AddVariableNames = settings.value(AddVariableNames,
+ QStringList(CMAKE_INSTALL_PREFIX)).toStringList();
+ this-AddVariableTypes = settings.value(AddVariableTypes,
+ QStringList(PATH)).toStringList();
QWidget* cont = new QWidget(this);
this-setupUi(cont
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7088-g35393cc
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 35393cc01c2c08cae42a242bf848eeea0f804a8f (commit)
via 97451e5376e3e4772049c32bee7a7abe8a98c956 (commit)
from ff744f3cfccebb01b436f2a5f09d5df7bce3850c (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=35393cc01c2c08cae42a242bf848eeea0f804a8f
commit 35393cc01c2c08cae42a242bf848eeea0f804a8f
Merge: ff744f3 97451e5
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Jan 14 01:26:29 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jan 14 01:26:29 2014 -0500
Merge topic 'var-type-autofill' into next
97451e53 Remember variable type in Add Entry
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97451e5376e3e4772049c32bee7a7abe8a98c956
commit 97451e5376e3e4772049c32bee7a7abe8a98c956
Author: Sergey Zolotarev sr...@yandex.com
AuthorDate: Mon Jan 13 17:28:16 2014 +0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Mon Jan 13 22:18:03 2014 -0700
Remember variable type in Add Entry
Store variable types together with their names in the variable completion
list so that the type is automatically recovered when you select a variable.
diff --git a/Source/QtDialog/AddCacheEntry.cxx
b/Source/QtDialog/AddCacheEntry.cxx
index e7fedc5..aa79bbd 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -15,6 +15,7 @@
#include QCompleter
static const int NumTypes = 4;
+static const int DefaultTypeIndex = 0;
static const QByteArray TypeStrings[NumTypes] =
{ BOOL, PATH, FILEPATH, STRING };
static const QCMakeProperty::PropertyType Types[NumTypes] =
@@ -43,7 +44,10 @@ AddCacheEntry::AddCacheEntry(QWidget* p, const QStringList
completions)
this-setTabOrder(path, filepath);
this-setTabOrder(filepath, string);
this-setTabOrder(string, this-Description);
- this-Name-setCompleter(new QCompleter(completions, this));
+ QCompleter *completer = new QCompleter(completions, this);
+ this-Name-setCompleter(completer);
+ connect(completer, SIGNAL(activated(const QString)),
+ this, SLOT(onCompletionActivated(const QString)));
}
QString AddCacheEntry::name() const
@@ -77,7 +81,32 @@ QCMakeProperty::PropertyType AddCacheEntry::type() const
{
return Types[idx];
}
- return QCMakeProperty::BOOL;
+ return Types[DefaultTypeIndex];
}
+QString AddCacheEntry::typeString() const
+{
+ int idx = this-Type-currentIndex();
+ if(idx = 0 idx NumTypes)
+{
+return TypeStrings[idx];
+}
+ return TypeStrings[DefaultTypeIndex];
+}
+void AddCacheEntry::onCompletionActivated(const QString text)
+{
+ int pos = text.lastIndexOf(':');
+ if (pos != -1)
+{
+QString type = text.mid(pos + 1, text.length() - pos).toUpper();
+for (int i = 0; i NumTypes; i++)
+ {
+if (TypeStrings[i] == type)
+ {
+ this-Type-setCurrentIndex(i);
+ break;
+ }
+ }
+}
+}
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index e219d4e..a491cec 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -30,6 +30,10 @@ public:
QVariant value() const;
QString description() const;
QCMakeProperty::PropertyType type() const;
+ QString typeString() const;
+
+private slots:
+ void onCompletionActivated(const QString text);
};
#endif
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index 1903c02..3af69b0 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -71,7 +71,7 @@ CMakeSetupDialog::CMakeSetupDialog()
restoreState(settings.value(windowState).toByteArray());
this-AddVariableCompletions = settings.value(AddVariableCompletionEntries,
- QStringList(CMAKE_INSTALL_PREFIX)).toStringList();
+ QStringList(CMAKE_INSTALL_PREFIX:PATH)).toStringList();
QWidget* cont = new QWidget(this);
this-setupUi(cont);
@@ -1066,16 +1066,18 @@ void CMakeSetupDialog::addCacheEntry()
// only add variable names to the completion which are new
if (!this-AddVariableCompletions.contains(w-name()))
{
- this-AddVariableCompletions w-name();
+ this-AddVariableCompletions QString(%1:%2).arg(w-name(),
+ w-typeString());
// limit to at most 100 completion items
if (this-AddVariableCompletions.size() 100)
{
this-AddVariableCompletions.removeFirst();
}
// make sure
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6832-gcb802bb
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 cb802bb16cab57f412577d1bc409d8f865b9eee6 (commit)
via 28f8ee492c68b4a7b95049e2e5f855a1d3d74d29 (commit)
from d27d193dae931d1c6e84d344418e52f05378f146 (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=cb802bb16cab57f412577d1bc409d8f865b9eee6
commit cb802bb16cab57f412577d1bc409d8f865b9eee6
Merge: d27d193 28f8ee4
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jan 8 08:06:59 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 8 08:06:59 2014 -0500
Merge topic 'qt4-find-root' into next
28f8ee4 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already
rooted.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28f8ee492c68b4a7b95049e2e5f855a1d3d74d29
commit 28f8ee492c68b4a7b95049e2e5f855a1d3d74d29
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jan 8 06:01:58 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Jan 8 06:01:58 2014 -0700
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 28b8454..46d3741 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -761,7 +761,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
set(QT_MKSPECS_DIR NOTFOUND)
find_path(QT_MKSPECS_DIR NAMES qconfig.pri
HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
- DOC The location of the Qt mkspecs containing qconfig.pri)
+ DOC The location of the Qt mkspecs containing qconfig.pri
+ NO_CMAKE_FIND_ROOT_PATH)
endif()
if(EXISTS ${QT_MKSPECS_DIR}/qconfig.pri)
@@ -917,7 +918,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endforeach()
find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs
designer
HINTS ${qt_cross_paths} ${qt_plugins_dir}
- DOC The location of the Qt plugins)
+ DOC The location of the Qt plugins
+ NO_CMAKE_FIND_ROOT_PATH)
endif ()
# ask qmake for the translations directory
@@ -937,6 +939,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
find_path(QT_IMPORTS_DIR NAMES Qt
HINTS ${qt_cross_paths} ${qt_imports_dir}
DOC The location of the Qt imports
+NO_CMAKE_FIND_ROOT_PATH
NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_SYSTEM_PATH)
mark_as_advanced(QT_IMPORTS_DIR)
---
Summary of changes:
Modules/FindQt4.cmake |7 +--
1 files changed, 5 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.12.1-6834-g2e29e1c
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 2e29e1c717a47bddb419df54c754b22d6bfaaf6c (commit)
via e8b8b37ef6fef094940d3384df5a1d421b9fa568 (commit)
from cb802bb16cab57f412577d1bc409d8f865b9eee6 (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=2e29e1c717a47bddb419df54c754b22d6bfaaf6c
commit 2e29e1c717a47bddb419df54c754b22d6bfaaf6c
Merge: cb802bb e8b8b37
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jan 8 08:08:02 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 8 08:08:02 2014 -0500
Merge topic 'qt4-find-root' into next
e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already
rooted.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568
commit e8b8b37ef6fef094940d3384df5a1d421b9fa568
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Jan 8 06:01:58 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Jan 8 06:07:24 2014 -0700
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
Thanks to Thomas Petazzoni for part of this fix.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 28b8454..46d3741 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -761,7 +761,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
set(QT_MKSPECS_DIR NOTFOUND)
find_path(QT_MKSPECS_DIR NAMES qconfig.pri
HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
- DOC The location of the Qt mkspecs containing qconfig.pri)
+ DOC The location of the Qt mkspecs containing qconfig.pri
+ NO_CMAKE_FIND_ROOT_PATH)
endif()
if(EXISTS ${QT_MKSPECS_DIR}/qconfig.pri)
@@ -917,7 +918,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endforeach()
find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs
designer
HINTS ${qt_cross_paths} ${qt_plugins_dir}
- DOC The location of the Qt plugins)
+ DOC The location of the Qt plugins
+ NO_CMAKE_FIND_ROOT_PATH)
endif ()
# ask qmake for the translations directory
@@ -937,6 +939,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
find_path(QT_IMPORTS_DIR NAMES Qt
HINTS ${qt_cross_paths} ${qt_imports_dir}
DOC The location of the Qt imports
+NO_CMAKE_FIND_ROOT_PATH
NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_SYSTEM_PATH)
mark_as_advanced(QT_IMPORTS_DIR)
---
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
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6688-g8429b7f
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 8429b7f97bfb1967943737145b72b6de5da1282f (commit)
via 81240bd674edc6ce929be1e89b3dbeec22ed913b (commit)
via 7fb2b806626b9af791d7372d2ff82b2cf1503237 (commit)
from 1ddd6ba58042b056df1506063f45985125a52ce7 (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=8429b7f97bfb1967943737145b72b6de5da1282f
commit 8429b7f97bfb1967943737145b72b6de5da1282f
Merge: 1ddd6ba 81240bd
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jan 4 11:24:25 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 4 11:24:25 2014 -0500
Merge topic 'unicode-main' into next
81240bd Use Encoding::CommandLineArguments for main() functions.
7fb2b80 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81240bd674edc6ce929be1e89b3dbeec22ed913b
commit 81240bd674edc6ce929be1e89b3dbeec22ed913b
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Dec 18 14:38:56 2013 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Jan 4 08:35:19 2014 -0700
Use Encoding::CommandLineArguments for main() functions.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 438b16d..b046f95 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -25,6 +25,7 @@
#include cmsys/CommandLineArguments.hxx
#include cmsys/SystemTools.hxx
+#include cmsys/Encoding.hxx
//
static const char * cmDocumentationName[][2] =
@@ -97,8 +98,13 @@ int cpackDefinitionArgument(const char* argument, const
char* cValue,
//
// this is CPack.
-int main (int argc, char *argv[])
+int main (int argc, char const* const argv[])
{
+ cmsys::Encoding::CommandLineArguments args =
+cmsys::Encoding::CommandLineArguments::Main(argc, argv);
+ argc = args.argc();
+ argv = args.argv();
+
cmSystemTools::FindCMakeResources(argv[0]);
cmCPackLog log;
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index ce50845..2d1ef5c 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -19,6 +19,7 @@
#include cmCursesMainForm.h
#include cmCursesStandardIncludes.h
+#include cmsys/Encoding.hxx
#include form.h
@@ -78,8 +79,13 @@ void CMakeErrorHandler(const char* message, const char*
title, bool, void* clie
self-AddError(message, title);
}
-int main(int argc, char** argv)
+int main(int argc, char const* const* argv)
{
+ cmsys::Encoding::CommandLineArguments encoding_args =
+cmsys::Encoding::CommandLineArguments::Main(argc, argv);
+ argc = encoding_args.argc();
+ argv = encoding_args.argv();
+
cmSystemTools::FindCMakeResources(argv[0]);
cmDocumentation doc;
doc.addCMakeStandardDocSections();
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 408bb4c..08c9673 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -21,6 +21,7 @@
#include cmVersion.h
#include cmsys/CommandLineArguments.hxx
#include cmsys/SystemTools.hxx
+#include cmsys/Encoding.hxx
//
static const char * cmDocumentationName[][2] =
@@ -48,12 +49,17 @@ static const char * cmDocumentationOptions[][2] =
int main(int argc, char** argv)
{
- cmSystemTools::FindCMakeResources(argv[0]);
+ cmsys::Encoding::CommandLineArguments args =
+cmsys::Encoding::CommandLineArguments::Main(argc, argv);
+ int argc2 = args.argc();
+ char const* const* argv2 = args.argv();
+
+ cmSystemTools::FindCMakeResources(argv2[0]);
// check docs first so that X is not need to get docs
// do docs, if args were given
cmDocumentation doc;
doc.addCMakeStandardDocSections();
- if(argc 1 doc.CheckOptions(argc, argv))
+ if(argc2 1 doc.CheckOptions(argc2, argv2))
{
// Construct and print requested documentation.
cmake hcm;
@@ -80,9 +86,9 @@ int main(int argc, char** argv)
}
// if arg for install
- for(int i =0; i argc; i++)
+ for(int i =0; i argc2; i++)
{
-if(strcmp(argv[i], --mac-install) == 0)
+if(strcmp(argv2[i], --mac-install) == 0)
{
QMacInstallDialog setupdialog(0);
setupdialog.exec();
@@ -116,7 +122,7 @@ int main(int argc, char** argv)
dialog.show();
cmsys::CommandLineArguments arg;
- arg.Initialize(argc, argv);
+ arg.Initialize(argc2, argv2);
std::string binaryDirectory;
std
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6690-g7c92f0f
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 7c92f0f6942c5d90a5b742c504649750a6b3dcff (commit)
via 6cce3d62eba40fdf3a5e5c0b89a2a66cbc3d5379 (commit)
from 8429b7f97bfb1967943737145b72b6de5da1282f (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=7c92f0f6942c5d90a5b742c504649750a6b3dcff
commit 7c92f0f6942c5d90a5b742c504649750a6b3dcff
Merge: 8429b7f 6cce3d6
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jan 4 12:42:45 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 4 12:42:45 2014 -0500
Merge topic 'unicode-main' into next
6cce3d6 Fix compile errors and warnings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cce3d62eba40fdf3a5e5c0b89a2a66cbc3d5379
commit 6cce3d62eba40fdf3a5e5c0b89a2a66cbc3d5379
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jan 4 10:42:03 2014 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Jan 4 10:42:03 2014 -0700
Fix compile errors and warnings.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index b046f95..a19b778 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -98,7 +98,7 @@ int cpackDefinitionArgument(const char* argument, const char*
cValue,
//
// this is CPack.
-int main (int argc, char const* const argv[])
+int main (int argc, char const* const* argv)
{
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 08c9673..821121e 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -49,10 +49,10 @@ static const char * cmDocumentationOptions[][2] =
int main(int argc, char** argv)
{
- cmsys::Encoding::CommandLineArguments args =
+ cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
- int argc2 = args.argc();
- char const* const* argv2 = args.argv();
+ int argc2 = encoding_args.argc();
+ char const* const* argv2 = encoding_args.argv();
cmSystemTools::FindCMakeResources(argv2[0]);
// check docs first so that X is not need to get docs
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 53900f1..3eb5551 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -112,7 +112,7 @@ static const char * cmDocumentationOptions[][2] =
};
// this is a test driver program for cmCTest.
-int main (int argc, char const* const argv[])
+int main (int argc, char const* const* argv)
{
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
---
Summary of changes:
Source/CPack/cpack.cxx |2 +-
Source/QtDialog/CMakeSetup.cxx |6 +++---
Source/ctest.cxx |2 +-
3 files changed, 5 insertions(+), 5 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.12.1-6692-gb1936c4
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 b1936c4bff89655cf61d0d7384a8848c17497a19 (commit)
via a1e542f19551072f101404e16e1dad901189f039 (commit)
from 7c92f0f6942c5d90a5b742c504649750a6b3dcff (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=b1936c4bff89655cf61d0d7384a8848c17497a19
commit b1936c4bff89655cf61d0d7384a8848c17497a19
Merge: 7c92f0f a1e542f
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jan 4 12:43:55 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jan 4 12:43:55 2014 -0500
Merge topic 'unicode-main' into next
a1e542f Use Encoding::CommandLineArguments for main() functions.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1e542f19551072f101404e16e1dad901189f039
commit a1e542f19551072f101404e16e1dad901189f039
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Dec 18 14:38:56 2013 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Sat Jan 4 10:43:12 2014 -0700
Use Encoding::CommandLineArguments for main() functions.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 438b16d..a19b778 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -25,6 +25,7 @@
#include cmsys/CommandLineArguments.hxx
#include cmsys/SystemTools.hxx
+#include cmsys/Encoding.hxx
//
static const char * cmDocumentationName[][2] =
@@ -97,8 +98,13 @@ int cpackDefinitionArgument(const char* argument, const
char* cValue,
//
// this is CPack.
-int main (int argc, char *argv[])
+int main (int argc, char const* const* argv)
{
+ cmsys::Encoding::CommandLineArguments args =
+cmsys::Encoding::CommandLineArguments::Main(argc, argv);
+ argc = args.argc();
+ argv = args.argv();
+
cmSystemTools::FindCMakeResources(argv[0]);
cmCPackLog log;
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index ce50845..2d1ef5c 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -19,6 +19,7 @@
#include cmCursesMainForm.h
#include cmCursesStandardIncludes.h
+#include cmsys/Encoding.hxx
#include form.h
@@ -78,8 +79,13 @@ void CMakeErrorHandler(const char* message, const char*
title, bool, void* clie
self-AddError(message, title);
}
-int main(int argc, char** argv)
+int main(int argc, char const* const* argv)
{
+ cmsys::Encoding::CommandLineArguments encoding_args =
+cmsys::Encoding::CommandLineArguments::Main(argc, argv);
+ argc = encoding_args.argc();
+ argv = encoding_args.argv();
+
cmSystemTools::FindCMakeResources(argv[0]);
cmDocumentation doc;
doc.addCMakeStandardDocSections();
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 408bb4c..821121e 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -21,6 +21,7 @@
#include cmVersion.h
#include cmsys/CommandLineArguments.hxx
#include cmsys/SystemTools.hxx
+#include cmsys/Encoding.hxx
//
static const char * cmDocumentationName[][2] =
@@ -48,12 +49,17 @@ static const char * cmDocumentationOptions[][2] =
int main(int argc, char** argv)
{
- cmSystemTools::FindCMakeResources(argv[0]);
+ cmsys::Encoding::CommandLineArguments encoding_args =
+cmsys::Encoding::CommandLineArguments::Main(argc, argv);
+ int argc2 = encoding_args.argc();
+ char const* const* argv2 = encoding_args.argv();
+
+ cmSystemTools::FindCMakeResources(argv2[0]);
// check docs first so that X is not need to get docs
// do docs, if args were given
cmDocumentation doc;
doc.addCMakeStandardDocSections();
- if(argc 1 doc.CheckOptions(argc, argv))
+ if(argc2 1 doc.CheckOptions(argc2, argv2))
{
// Construct and print requested documentation.
cmake hcm;
@@ -80,9 +86,9 @@ int main(int argc, char** argv)
}
// if arg for install
- for(int i =0; i argc; i++)
+ for(int i =0; i argc2; i++)
{
-if(strcmp(argv[i], --mac-install) == 0)
+if(strcmp(argv2[i], --mac-install) == 0)
{
QMacInstallDialog setupdialog(0);
setupdialog.exec();
@@ -116,7 +122,7 @@ int main(int argc, char** argv)
dialog.show();
cmsys::CommandLineArguments arg;
- arg.Initialize(argc, argv);
+ arg.Initialize(argc2, argv2);
std::string binaryDirectory;
std::string sourceDirectory;
typedef cmsys::CommandLineArguments argT;
diff
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6318-gbb28cf4
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 bb28cf47f1d44395e59097ad7c912fc22326a262 (commit) via fe43ca255fb4b458a75c9986e62081980892f8b1 (commit) from 7df1ece4aebe781ce51c59640876e5dc5c5a3fc0 (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=bb28cf47f1d44395e59097ad7c912fc22326a262 commit bb28cf47f1d44395e59097ad7c912fc22326a262 Merge: 7df1ece fe43ca2 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Fri Dec 20 11:55:45 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Dec 20 11:55:45 2013 -0500 Merge topic 'rpath-default' into next fe43ca2 OS X: Add CMP0042 to enable MACOSX_RPATH by default. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe43ca255fb4b458a75c9986e62081980892f8b1 commit fe43ca255fb4b458a75c9986e62081980892f8b1 Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Dec 18 21:25:29 2013 -0700 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Fri Dec 20 09:34:47 2013 -0700 OS X: Add CMP0042 to enable MACOSX_RPATH by default. Also adding documentation for CMAKE_MACOSX_RPATH, and improving documentation for MACOSX_RPATH. diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 5e94f89..1e57495 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -75,3 +75,4 @@ All Policies /policy/CMP0039 /policy/CMP0040 /policy/CMP0041 + /policy/CMP0042 diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index d86db37..aebfe87 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -207,6 +207,7 @@ Variables that Control the Build /variable/CMAKE_LINK_LIBRARY_FILE_FLAG /variable/CMAKE_LINK_LIBRARY_FLAG /variable/CMAKE_MACOSX_BUNDLE + /variable/CMAKE_MACOSX_RPATH /variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG /variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG /variable/CMAKE_MODULE_LINKER_FLAGS diff --git a/Help/policy/CMP0042.rst b/Help/policy/CMP0042.rst new file mode 100644 index 000..0ed3bd1 --- /dev/null +++ b/Help/policy/CMP0042.rst @@ -0,0 +1,19 @@ +CMP0042 +--- + +:prop_tgt:`MACOSX_RPATH` is enabled by default. + +CMake 2.8.12 and newer has support for using ``@rpath`` in a target's install +name. This was enabled by setting the target property +:prop_tgt:`MACOSX_RPATH`. The ``@rpath`` in an install name is a more +flexible and powerful mechanism than ``@executable_path`` or ``@loader_path`` +for locating shared libraries. + +CMake 3.0.0 and later prefer this property to be ON by default. Projects +wanting ``@rpath`` in a target's install name may remove any setting of +the :prop_tgt:`INSTALL_NAME_DIR` and :variable:`CMAKE_INSTALL_NAME_DIR` +variables. + +This policy was introduced in CMake version 3.0.0. CMake version +|release| warns when the policy is not set and uses OLD behavior. Use +the cmake_policy command to set it to OLD or NEW explicitly. diff --git a/Help/prop_tgt/MACOSX_RPATH.rst b/Help/prop_tgt/MACOSX_RPATH.rst index f2d8078..d3934ba 100644 --- a/Help/prop_tgt/MACOSX_RPATH.rst +++ b/Help/prop_tgt/MACOSX_RPATH.rst @@ -4,7 +4,15 @@ MACOSX_RPATH Whether to use rpaths on Mac OS X. When this property is set to true, the directory portion of -theinstall_name field of shared libraries will default to -@rpath.Runtime paths will also be embedded in binaries using this -target.This property is initialized by the value of the variable -CMAKE_MACOSX_RPATH if it is set when a target is created. +the install_name field of shared libraries will be ``@rpath`` +unless overridden by :prop_tgt:`INSTALL_NAME_DIR`. Runtime +paths will also be embedded in binaries using this target and +can be controlled by the :prop_tgt:`INSTALL_RPATH` target property. +This property is initialized by the value of the variable +:variable:`CMAKE_MACOSX_RPATH` if it is set when a target is +created. + +Policy CMP0042 was introduced to change the default value of +MACOSX_RPATH to ON. This is because use of ``@rpath`` is a +more flexible and powerful alternative to ``@executable_path`` and +``@loader_path``. diff --git a/Help/variable/CMAKE_MACOSX_RPATH.rst b/Help/variable/CMAKE_MACOSX_RPATH.rst new file mode 100644 index 000..ac897c0 --- /dev/null +++ b/Help/variable/CMAKE_MACOSX_RPATH.rst @@ -0,0 +1,7 @@ +CMAKE_MACOSX_RPATH +--- + +Whether to use rpaths on Mac OS X. + +This variable is used to initialize the :prop_tgt:`MACOSX_RPATH` property on +all targets. diff --git a/Source/cmComputeLinkInformation.cxx b/Source
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6320-g5e4cf9e
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 5e4cf9e325ab64323025e8d4de87a9d9758d3b75 (commit)
via 460c742b73a1920bbf404c90afa8e6687820a355 (commit)
from bb28cf47f1d44395e59097ad7c912fc22326a262 (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=5e4cf9e325ab64323025e8d4de87a9d9758d3b75
commit 5e4cf9e325ab64323025e8d4de87a9d9758d3b75
Merge: bb28cf4 460c742
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 20 12:12:57 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 20 12:12:57 2013 -0500
Merge topic 'rpath-default' into next
460c742 OS X: Only run CMP0042 test on Darwin.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=460c742b73a1920bbf404c90afa8e6687820a355
commit 460c742b73a1920bbf404c90afa8e6687820a355
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Dec 20 10:11:45 2013 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Dec 20 10:11:45 2013 -0700
OS X: Only run CMP0042 test on Darwin.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 011e9b0..96724ce 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -61,7 +61,9 @@ add_RunCMake_test(CMP0038)
add_RunCMake_test(CMP0039)
add_RunCMake_test(CMP0040)
add_RunCMake_test(CMP0041)
-add_RunCMake_test(CMP0042)
+if(CMAKE_SYSTEM_NAME MATCHES Darwin AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG)
+ add_RunCMake_test(CMP0042)
+endif()
add_RunCMake_test(CTest)
if(UNIX AND ${CMAKE_TEST_GENERATOR} MATCHES Unix Makefiles)
add_RunCMake_test(CompilerChange)
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |4 +++-
1 files changed, 3 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.12.1-6076-g38dc376
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 38dc376b5ae0f550979912398782cd0e75ff976e (commit)
via 4ee3b6558b0cd1c1029848f40818dc14eb874448 (commit)
from 4bcf2d1dbf7e1e99e4a6dd265d834996a11e9343 (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=38dc376b5ae0f550979912398782cd0e75ff976e
commit 38dc376b5ae0f550979912398782cd0e75ff976e
Merge: 4bcf2d1 4ee3b65
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Thu Dec 5 18:06:36 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Dec 5 18:06:36 2013 -0500
Merge topic 'qt4-qmake-exe' into next
4ee3b65 FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE
properly.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ee3b6558b0cd1c1029848f40818dc14eb874448
commit 4ee3b6558b0cd1c1029848f40818dc14eb874448
Author: Simon Sasburg simon.sasb...@gmail.com
AuthorDate: Thu Dec 5 22:21:03 2013 +
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Thu Dec 5 15:39:41 2013 -0700
FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 46a0355..24747f7 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -738,6 +738,11 @@ _qt4_find_qmake(${_QT4_QMAKE_NAMES} QT_QMAKE_EXECUTABLE
QTVERSION)
if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+ if (QT_QMAKE_EXECUTABLE_LAST)
+string(COMPARE NOTEQUAL ${QT_QMAKE_EXECUTABLE_LAST}
${QT_QMAKE_EXECUTABLE} QT_QMAKE_CHANGED)
+ endif()
+ set(QT_QMAKE_EXECUTABLE_LAST ${QT_QMAKE_EXECUTABLE} CACHE INTERNAL
FORCE)
+
_qt4_get_version_components(${QTVERSION} QT_VERSION_MAJOR QT_VERSION_MINOR
QT_VERSION_PATCH)
# ask qmake for the mkspecs directory
---
Summary of changes:
Modules/FindQt4.cmake |5 +
1 files changed, 5 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
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5572-gbe5a136
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 be5a1368299743dccb7a4d7abfb6bde99cdc4170 (commit)
via b56698737463b2cfcc282c2ef412e89fb28d2c9e (commit)
from 7c2c3741568795e99273170c5189ff3445e92b0e (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=be5a1368299743dccb7a4d7abfb6bde99cdc4170
commit be5a1368299743dccb7a4d7abfb6bde99cdc4170
Merge: 7c2c374 b566987
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Nov 20 23:26:39 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 20 23:26:39 2013 -0500
Merge topic 'qt-dialog-reconfigure' into next
b566987 cmake-gui: Configure again if a variable is changed before Generate
is pushed.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b56698737463b2cfcc282c2ef412e89fb28d2c9e
commit b56698737463b2cfcc282c2ef412e89fb28d2c9e
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Nov 20 21:24:54 2013 -0700
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Nov 20 21:24:54 2013 -0700
cmake-gui: Configure again if a variable is changed before Generate is
pushed.
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index a7665c8..c146bc5 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -946,6 +946,7 @@ void CMakeSetupDialog::saveBuildPaths(const QStringList
paths)
void CMakeSetupDialog::setCacheModified()
{
this-CacheModified = true;
+ this-ConfigureNeeded = true;
this-enterState(ReadyConfigure);
}
---
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx |1 +
1 files changed, 1 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
[Cmake-commits] CMake branch, next, updated. v2.8.12-4730-gf24ef61
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 f24ef61cddba064cf2ed448294b1f78f2c4362b7 (commit)
via 53d6ebb36079bd30c9033e4374fd8d31a2928b6a (commit)
from 10e54d095de4c136589a588d10b7b68a79db289a (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=f24ef61cddba064cf2ed448294b1f78f2c4362b7
commit f24ef61cddba064cf2ed448294b1f78f2c4362b7
Merge: 10e54d0 53d6ebb
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Nov 1 07:32:00 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Nov 1 07:32:00 2013 -0400
Merge topic 'cpack-drag-n-drop-rez' into next
53d6ebb cpack: For DragNDrop generator, add sysroot option when calling Rez.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53d6ebb36079bd30c9033e4374fd8d31a2928b6a
commit 53d6ebb36079bd30c9033e4374fd8d31a2928b6a
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Nov 1 05:31:07 2013 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Nov 1 05:31:07 2013 -0600
cpack: For DragNDrop generator, add sysroot option when calling Rez.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index cd98f49..2d641f5 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -519,9 +519,9 @@ cpack_set_if_not_set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE )
# WiX specific variables
cpack_set_if_not_set(CPACK_WIX_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
-# osx sysroot
+# set sysroot so SDK tools can be used
if(CMAKE_OSX_SYSROOT)
- set(CPACK_OSX_SYSROOT ${CMAKE_OSX_SYSROOT})
+ cpack_set_if_not_set(CPACK_OSX_SYSROOT ${CMAKE_OSX_SYSROOT})
endif()
if(DEFINED CPACK_COMPONENTS_ALL)
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index ab386d3..dfb2f15 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -505,7 +505,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string
src_dir,
cmOStringStream embed_sla_command;
embed_sla_command this-GetOption(CPACK_COMMAND_REZ);
const char* sysroot = this-GetOption(CPACK_OSX_SYSROOT);
-if(sysroot)
+if(sysroot sysroot[0] != '\0')
{
embed_sla_command -isysroot \ sysroot \;
}
---
Summary of changes:
Modules/CPack.cmake|4 ++--
Source/CPack/cmCPackDragNDropGenerator.cxx |2 +-
2 files changed, 3 insertions(+), 3 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.12-4335-g65109d6
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 65109d61f0319907c0ca946e4a38d171d47e26fb (commit) via 656716d79478da65f624ef66532dc14c4d41f20a (commit) from ab621fcd625293241596001fc935c0e04b81894c (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=65109d61f0319907c0ca946e4a38d171d47e26fb commit 65109d61f0319907c0ca946e4a38d171d47e26fb Merge: ab621fc 656716d Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Oct 23 09:05:00 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 23 09:05:00 2013 -0400 Merge topic 'qt4-svg-dep' into next 656716d qt4: Fix linking with QtSvg to not include QtXml. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=656716d79478da65f624ef66532dc14c4d41f20a commit 656716d79478da65f624ef66532dc14c4d41f20a Author: Clinton Stimpson clin...@elemtech.com AuthorDate: Wed Oct 23 07:03:18 2013 -0600 Commit: Clinton Stimpson clin...@elemtech.com CommitDate: Wed Oct 23 07:04:02 2013 -0600 qt4: Fix linking with QtSvg to not include QtXml. Fixes issue #14505. diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index 35090fc..aa036b7 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -63,7 +63,7 @@ endif () # list dependent modules, so dependent libraries are added set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) -set(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE) +set(QT_QTSVG_MODULE_DEPENDS QTGUI QTCORE) set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE) set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE) if(QT_QTDBUS_FOUND) --- Summary of changes: Modules/UseQt4.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.11.2-4112-g7124bc4
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 7124bc45c79f8e7db5cd7e6e945561c12118393e (commit)
via 81ea3637b4a49d028fbce47d92de979d0ecd1278 (commit)
from 05435dfab93add5d256fab8df05fad4b60a0f9f9 (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=7124bc45c79f8e7db5cd7e6e945561c12118393e
commit 7124bc45c79f8e7db5cd7e6e945561c12118393e
Merge: 05435df 81ea363
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Sep 10 16:36:38 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 10 16:36:38 2013 -0400
Merge topic 'cmake-gui-window-settings' into next
81ea363 cmake-gui: save and restore the geometry and window state between
sessions.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ea3637b4a49d028fbce47d92de979d0ecd1278
commit 81ea3637b4a49d028fbce47d92de979d0ecd1278
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Tue Sep 10 14:35:11 2013 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Tue Sep 10 14:35:11 2013 -0600
cmake-gui: save and restore the geometry and window state between sessions.
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx
b/Source/QtDialog/CMakeSetupDialog.cxx
index 4d62f72..a4dfdc9 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -66,9 +66,8 @@ CMakeSetupDialog::CMakeSetupDialog()
// create the GUI
QSettings settings;
settings.beginGroup(Settings/StartPath);
- int h = settings.value(Height, 500).toInt();
- int w = settings.value(Width, 700).toInt();
- this-resize(w, h);
+ restoreGeometry(settings.value(geometry).toByteArray());
+ restoreState(settings.value(windowState).toByteArray());
this-AddVariableCompletions = settings.value(AddVariableCompletionEntries,
QStringList(CMAKE_INSTALL_PREFIX)).toStringList();
@@ -299,8 +298,8 @@ CMakeSetupDialog::~CMakeSetupDialog()
{
QSettings settings;
settings.beginGroup(Settings/StartPath);
- settings.setValue(Height, this-height());
- settings.setValue(Width, this-width());
+ settings.setValue(windowState, QVariant(saveState()));
+ settings.setValue(geometry, QVariant(saveGeometry()));
settings.setValue(SplitterSizes, this-Splitter-saveState());
// wait for thread to stop
---
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx |9 -
1 files changed, 4 insertions(+), 5 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.11.2-3957-g491e3c9
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 491e3c936ce1363780affa589408284ac2198c07 (commit)
via 78cd8842966efb6d54668d47ee92bdeed35cc79e (commit)
from 18956613a819910bd4c0ac6ed223a938bdb715f8 (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=491e3c936ce1363780affa589408284ac2198c07
commit 491e3c936ce1363780affa589408284ac2198c07
Merge: 1895661 78cd884
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Aug 21 23:29:21 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 21 23:29:21 2013 -0400
Merge topic 'rpath-on-mac' into next
78cd884 OSX: Allow an empty INSTALL_NAME_DIR to override MACOSX_RPATH.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78cd8842966efb6d54668d47ee92bdeed35cc79e
commit 78cd8842966efb6d54668d47ee92bdeed35cc79e
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed Aug 21 21:09:32 2013 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Wed Aug 21 21:09:51 2013 -0600
OSX: Allow an empty INSTALL_NAME_DIR to override MACOSX_RPATH.
With this, projects can enable MACOSX_RPATH by default, but still have
a way to install libraries with no install name dirs into locations
such as /usr/local/lib by setting INSTALL_NAME_DIR=.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b9dc423..dd1bdde 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1615,7 +1615,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
this-IsApple = this-Makefile-IsOn(APPLE);
// Setup default property values.
- this-SetPropertyDefault(INSTALL_NAME_DIR, );
+ this-SetPropertyDefault(INSTALL_NAME_DIR, 0);
this-SetPropertyDefault(INSTALL_RPATH, );
this-SetPropertyDefault(INSTALL_RPATH_USE_LINK_PATH, OFF);
this-SetPropertyDefault(SKIP_BUILD_RPATH, OFF);
@@ -4541,6 +4541,10 @@ bool cmTarget::HasMacOSXRpath(const char* config)
{
install_name_is_rpath = true;
}
+else if(install_name use_install_name)
+ {
+ return false;
+ }
}
else
{
@@ -5273,18 +5277,18 @@ std::string cmTarget::GetInstallNameDirForInstallTree()
if(this-Makefile-IsOn(CMAKE_PLATFORM_HAS_INSTALLNAME))
{
std::string dir;
+const char* install_name_dir = this-GetProperty(INSTALL_NAME_DIR);
if(!this-Makefile-IsOn(CMAKE_SKIP_RPATH)
!this-Makefile-IsOn(CMAKE_SKIP_INSTALL_RPATH))
{
- const char* install_name_dir = this-GetProperty(INSTALL_NAME_DIR);
if(install_name_dir *install_name_dir)
{
dir = install_name_dir;
dir += /;
}
}
-if(dir.empty() this-GetPropertyAsBool(MACOSX_RPATH))
+if(!install_name_dir this-GetPropertyAsBool(MACOSX_RPATH))
{
dir = @rpath/;
}
---
Summary of changes:
Source/cmTarget.cxx | 10 +++---
1 files changed, 7 insertions(+), 3 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.11.2-3435-gf5e5ce4
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 f5e5ce4d567844c95185b23071f9c73f771abc19 (commit)
via 84698abb514b665c5db5111ecf247d44b9979844 (commit)
via 46558d290be1760828714545f41afae17b0c71c9 (commit)
from a8b552af1266ab35a09219eb613974d3fab4a641 (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=f5e5ce4d567844c95185b23071f9c73f771abc19
commit f5e5ce4d567844c95185b23071f9c73f771abc19
Merge: a8b552a 84698ab
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Sat Jul 27 00:40:26 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Jul 27 00:40:26 2013 -0400
Merge topic 'rpath-on-mac' into next
84698ab OS X: If necessary, use xcrun to help find otool used to query
install names.
46558d2 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84698abb514b665c5db5111ecf247d44b9979844
commit 84698abb514b665c5db5111ecf247d44b9979844
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Fri Jul 26 22:17:30 2013 -0600
Commit: Clinton Stimpson clin...@elemtech.com
CommitDate: Fri Jul 26 22:38:57 2013 -0600
OS X: If necessary, use xcrun to help find otool used to query install
names.
This fixes querying for @rpath install names when using Xcode without
the command line tools installed.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c52c266..37344dc 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2464,7 +2464,15 @@ bool cmSystemTools::GuessLibraryInstallName(std::string
const fullPath,
cmds.push_back(fullPath.c_str());
std::string output;
- RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE);
+ if(!RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE))
+{
+cmds.insert(cmds.begin(), -r);
+cmds.insert(cmds.begin(), xcrun);
+if(!RunSingleCommand(cmds, output, 0, 0, OUTPUT_NONE))
+ {
+ return false;
+ }
+}
std::vectorstd::string strs = cmSystemTools::tokenize(output, \n);
// otool returns extra lines reporting multiple install names
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmSystemTools.cxx | 10 +-
2 files changed, 10 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
