[cmake-developers] [CMake 0013745]: CHECK_C_COMPILER_FLAG doesn't work with -march=xlr option with a MIPS gcc cross compiler
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=13745 == Reported By:Mahendra Ladhe Assigned To: == Project:CMake Issue ID: 13745 Category: CMake Reproducibility:always Severity: major Priority: normal Status: new == Date Submitted: 2012-11-27 04:25 EST Last Modified: 2012-11-27 04:25 EST == Summary:CHECK_C_COMPILER_FLAG doesn't work with -march=xlr option with a MIPS gcc cross compiler Description: I 've a CMakeLists.txt file as below. CHECK_C_COMPILER_FLAG (-march=xlr FLAG_xlr) CHECK_C_COMPILER_FLAG (-march=xlp FLAG_xlp) I'm using a gcc MIPS cross compiler. Using this cross compiler I'm able to compile a simple C program using both -march=xlr and -march=xlp compiler options. The size of a.out differs with these two options (just to show that -march option is acted upon by the compiler) When I invoke cmake on above CMakeLists.txt file, I get the following. -- Performing Test FLAG_xlr -- Performing Test FLAG_xlr - Failed -- Performing Test FLAG_xlp -- Performing Test FLAG_xlp - Success It says Test FLAG_xlr failed, but it shouldn't fail since the cross compiler does support -march=xlr option. Steps to Reproduce: As described above. I cannot provide the gcc cross compiler used since it's not publicly available. == Issue History Date ModifiedUsername FieldChange == 2012-11-27 04:25 Mahendra Ladhe New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013746]: FindOpenGL module reports OpenGL_FOUND even when no OPENGL_INCLUDE_DIR is set
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13746 == Reported By:hades Assigned To: == Project:CMake Issue ID: 13746 Category: Modules Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2012-11-27 06:32 EST Last Modified: 2012-11-27 06:32 EST == Summary:FindOpenGL module reports OpenGL_FOUND even when no OPENGL_INCLUDE_DIR is set Description: When cmake can find a libGL.so, but no gl.h, it still sets OPENGL_FOUND to TRUE, despite that OPENGL_INCLUDE_DIR is set to NOTFOUND and therefore completely unusable. I believe line 153 should be changed from: FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY) to: FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY OPENGL_INCLUDE_DIR) == Issue History Date ModifiedUsername FieldChange == 2012-11-27 06:32 hades New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013747]: export(PACKAGE) prioritizes build-tree over install-tree
The following issue has been SUBMITTED.
==
http://public.kitware.com/Bug/view.php?id=13747
==
Reported By:Stephen Kelly
Assigned To:
==
Project:CMake
Issue ID: 13747
Category: CMake
Reproducibility:have not tried
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2012-11-27 09:19 EST
Last Modified: 2012-11-27 09:19 EST
==
Summary:export(PACKAGE) prioritizes build-tree over
install-tree
Description:
The package BoostAny depends on BoostCore. Both packages create a Config file in
the build tree and install one in the install tree. There is a export(PACKAGE)
call for each of them.
If I set CMAKE_PREFIX_PATH to the install location of BoostAny, I can use
find_package(BoostAny) and it will find it in the install location.
However, as BoostAnyConfig.cmake has a find_package(BoostCore) inside it, the
BoostCore package is found in the build-tree instead of the install tree. As the
BoostAny and BoostCore packages are both installed and beside each other in the
filesystem, this is an unintuitive result.
The find_package documentation does not state the order of prefixes searched for
packages. It seems to me that the export(PACKAGE) prefixes should be a fallback
after trying in the CMAKE_PREFIX_PATH, but I don't know if that can be changed
now.
It would be possible to use find_package( ... PATHS ${CMAKE_CURRENT_LIST_DIR} )
in BoostAnyConfig.cmake, but that would require that all Boost packages be
installed to the same prefix. It may be that they want to be able to install
different libraries to different prefixes (I don't know, but I think CMake
should allow it).
==
Issue History
Date ModifiedUsername FieldChange
==
2012-11-27 09:19 Stephen Kelly New Issue
==
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] WindowsCE
Hi,
since CMake 2.8.10 it's possible to build for WindowsCE via the NMake
Makefile. But this needs some special preperation of the environment
variables. My last changed added parsing support for
WCE.VCPlatform.config, where this information is stored. Qt has a
special tool (http://qt.gitorious.org/qt/qt/trees/4.8/tools/checksdk)
for extracting this information. I'd like to add a similar functionality
to make the environment setup easier.
I attached a first version of a possible solution. Maybe someone can
give me some early feedack before I add documentation and so on (it
needs rebase too), because I'm not sure if that is a good place for this
kind of stuff.
-- Patrick
diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx
index 270ee0c..637ed01 100644
--- a/Source/cmVisualStudioWCEPlatformParser.cxx
+++ b/Source/cmVisualStudioWCEPlatformParser.cxx
@@ -15,18 +15,21 @@
int cmVisualStudioWCEPlatformParser::ParseVersion(const char* version)
{
- std::string vskey = cmGlobalVisualStudioGenerator::GetRegistryBase(version);
- vskey += \\Setup\\VS;ProductDir;
+ const std::string registryBase =
+cmGlobalVisualStudioGenerator::GetRegistryBase(version);
+ const std::string vckey = registryBase + \\Setup\\VC;ProductDir;
+ const std::string vskey = registryBase + \\Setup\\VS;ProductDir;
- std::string vsInstallPath;
- if(!cmSystemTools::ReadRegistryValue(vskey.c_str(), vsInstallPath))
+ if(!cmSystemTools::ReadRegistryValue(vckey.c_str(), this-VcInstallDir) ||
+ !cmSystemTools::ReadRegistryValue(vskey.c_str(), this-VsInstallDir))
{
return 0;
}
- cmSystemTools::ConvertToUnixSlashes(vsInstallPath);
+ cmSystemTools::ConvertToUnixSlashes(this-VcInstallDir);
+ cmSystemTools::ConvertToUnixSlashes(this-VsInstallDir);
const std::string configFilename =
-vsInstallPath + /VC/vcpackages/WCE.VCPlatform.config;
+this-VcInstallDir + /vcpackages/WCE.VCPlatform.config;
return this-ParseFile(configFilename.c_str());
}
@@ -93,6 +96,24 @@ void cmVisualStudioWCEPlatformParser::StartElement(const char* name,
this-Macros[name] = value;
}
}
+ else if(strcmp(name, Directories) == 0)
+{
+for(const char** attr = attributes; *attr; attr += 2)
+ {
+ if(strcmp(attr[0], Include) == 0)
+{
+this-Include = attr[1];
+}
+ else if(strcmp(attr[0], Library) == 0)
+{
+this-Library = attr[1];
+}
+ else if(strcmp(attr[0], Path) == 0)
+{
+this-Path = attr[1];
+}
+ }
+}
}
void cmVisualStudioWCEPlatformParser::EndElement(const char* name)
@@ -137,3 +158,14 @@ void cmVisualStudioWCEPlatformParser::CharacterDataHandler(const char* data,
{
this-CharacterData.append(data, length);
}
+
+std::string cmVisualStudioWCEPlatformParser::FixPaths(
+const std::string paths) const
+{
+ std::string ret = paths;
+ cmSystemTools::ReplaceString(ret, $(PATH), %PATH%);
+ cmSystemTools::ReplaceString(ret, $(VCInstallDir), VcInstallDir.c_str());
+ cmSystemTools::ReplaceString(ret, $(VSInstallDir), VsInstallDir.c_str());
+ cmSystemTools::ReplaceString(ret, \\, /);
+ return ret;
+}
diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h
index 60de01e..64e7205 100644
--- a/Source/cmVisualStudioWCEPlatformParser.h
+++ b/Source/cmVisualStudioWCEPlatformParser.h
@@ -31,6 +31,12 @@ public:
bool Found() const {return this-FoundRequiredName;}
const char* GetArchitectureFamily() const;
std::string GetOSVersion() const;
+ std::string GetIncludeDirectories() const {
+return this-FixPaths(this-Include); }
+ std::string GetLibraryDirectories() const {
+return this-FixPaths(this-Library); }
+ std::string GetPathDirectories() const {
+return this-FixPaths(this-Path); }
const std::vectorstd::string GetAvailablePlatforms() const {
return this-AvailablePlatforms; }
@@ -40,8 +46,13 @@ protected:
void CharacterDataHandler(const char* data, int length);
private:
+ std::string FixPaths(const std::string paths) const;
+
std::string CharacterData;
+ std::string Include;
+ std::string Library;
+ std::string Path;
std::string PlatformName;
std::string OSMajorVersion;
std::string OSMinorVersion;
@@ -50,6 +61,8 @@ private:
bool FoundRequiredName;
const char* RequiredName;
+ std::string VcInstallDir;
+ std::string VsInstallDir;
};
#endif
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 1424a11..77ccc69 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -82,6 +82,7 @@
#if defined(CMAKE_HAVE_VS_GENERATORS)
#include cmCallVisualStudioMacro.h
+#include cmVisualStudioWCEPlatformParser.h
#endif
#if !defined(CMAKE_BOOT_MINGW)
@@ -1689,6 +1690,14 @@ int cmake::ExecuteCMakeCommand(std::vectorstd::string args)
{
return cmake::VisualStudioLink(args, 2);
}
+else if (args[1] == windowsce_environment8
[cmake-developers] CMake 2.8.10.2 available for download
And a few more... Here are some important bug fixes to the CMake 2.8.10 release. Thanks going out to Alex Neundorf, Brad King, Rolf Eike Beer, (and me), … fixes for the following problems are now available in a 2.8.10.2 bug fix release. The change log page for this bug-fix only release is here: http://public.kitware.com/Bug/changelog_page.php?version_id=107 Please use the latest release installers from our download page http://cmake.org/cmake/resources/software.html rather than any previous 2.8.10 builds. Thanks for your continued support! -Dave These are the commits that fixed the problems: Changes in CMake 2.8.10.2 (since 2.8.10.1) -- Alex Neundorf (1): Automoc: fix regression #13667, broken build in phonon Brad King (1): Initialize IMPORTED GLOBAL targets on reconfigure (#13702) David Cole (1): CMake: Fix infinite loop untarring corrupt tar file Rolf Eike Beer (1): FindGettext: fix overwriting result with empty variable (#13691) -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0013750]: Binaries for Win64
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=13750 == Reported By:David Doria Assigned To: == Project:CMake Issue ID: 13750 Category: Documentation Reproducibility:N/A Severity: minor Priority: normal Status: new == Date Submitted: 2012-11-27 21:08 EST Last Modified: 2012-11-27 21:08 EST == Summary:Binaries for Win64 Description: I see on this page: http://www.cmake.org/cmake/resources/software.html that there are binaries for Win32 (cmake-2.8.10.1-win32-x86.exe). However, it does not mention that the same executable works for Win64 (which it seems to). Perhaps a note should be added to avoid confusion. Or simply name the executable cmake-2.8.10.1-win.exe and make the description Win 32/64 to be explicit. == Issue History Date ModifiedUsername FieldChange == 2012-11-27 21:08 David DoriaNew Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] Building multiple Debian packages from one source
Hi, I am currently trying to build more then one Debian package from my sources. One package should contain the shared lib and the binary and should simply be called projectname-1.0.0.deb and the other one should contain the headers and optionally a static lib and should be called projectname-1.0.0-dev.deb. I found this post ( http://cmake.3232098.n2.nabble.com/Multiple-Package-Generators-and-add-package-command-td6067405.html), possibly describing what to do but it doesn't seem to work for me. I still only get one package containing the same stuff it contained before adding the COMPONENT statement to my INSTALLs and adding cpack_add_component. Is this approach described in this post the right approach at all for my desired goal? If so: Are cpack_add_component_group and cpack_add_install_type mandatory? How do I set the file name for every component respectively package? If not: Is this even possible with CMake without having to CMakeLists.txt files and changing them for every desired package? Best regards, Patrick -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
On Nov 27, 2012, at 12:46 AM, Titus von Boxberg ti...@v9g.de wrote: Am 27.11.2012 05:24, schrieb Michael Jackson: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? You could add /MP to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS Regards Titus -- Thanks for the tip. I'll give it a try. ___ Mike JacksonPrincipal Software Engineer BlueQuartz SoftwareDayton, Ohio mike.jack...@bluequartz.net www.bluequartz.net -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Building multiple Debian packages from one source
2012/11/27 Patrick Nowak pa.no...@tu-bs.de: Hi, I am currently trying to build more then one Debian package from my sources. One package should contain the shared lib and the binary and should simply be called projectname-1.0.0.deb and the other one should contain the headers and optionally a static lib and should be called projectname-1.0.0-dev.deb. I found this post ( http://cmake.3232098.n2.nabble.com/Multiple-Package-Generators-and-add-package-command-td6067405.html), possibly describing what to do but it doesn't seem to work for me. I still only get one package containing the same stuff it contained before adding the COMPONENT statement to my INSTALLs and adding cpack_add_component. You should enable component packaging for the DEB generator: set(CPACK_DEB_COMPONENT_INSTALL 1) see: cpack --help-variable CPACK_GENNAME_COMPONENT_INSTALL for backward compatibility reason some CPack generators (including DEB) default to monolithic installer http://www.vtk.org/Wiki/CMake:Component_Install_With_CPack#Enabling_Component_Packaging Is this approach described in this post the right approach at all for my desired goal? Yes it should work, read the Wiki as well in order to get the big picture. There is one limitation you won't able to overcome for now is the naming scheme makes it impossible to have a component package named: projectname-1.0.0.deb you will always get projectname-1.0.0-compName.deb see this bug/features request: http://public.kitware.com/Bug/view.php?id=12997 and the related ones. Are cpack_add_component_group and cpack_add_install_type mandatory? How do I set the file name for every component respectively package? Nope. If not: Is this even possible with CMake without having to CMakeLists.txt files and changing them for every desired package? I don't understand this? -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Building multiple Debian packages from one source
Hi Eric, thanks, set(CPACK_DEB_COMPONENT_INSTALL 1) solved my problem. Best regards, Patrick Am 27.11.2012 14:17, schrieb Eric Noulard: 2012/11/27 Patrick Nowak pa.no...@tu-bs.de: Hi, I am currently trying to build more then one Debian package from my sources. One package should contain the shared lib and the binary and should simply be called projectname-1.0.0.deb and the other one should contain the headers and optionally a static lib and should be called projectname-1.0.0-dev.deb. I found this post ( http://cmake.3232098.n2.nabble.com/Multiple-Package-Generators-and-add-package-command-td6067405.html), possibly describing what to do but it doesn't seem to work for me. I still only get one package containing the same stuff it contained before adding the COMPONENT statement to my INSTALLs and adding cpack_add_component. You should enable component packaging for the DEB generator: set(CPACK_DEB_COMPONENT_INSTALL 1) see: cpack --help-variable CPACK_GENNAME_COMPONENT_INSTALL for backward compatibility reason some CPack generators (including DEB) default to monolithic installer http://www.vtk.org/Wiki/CMake:Component_Install_With_CPack#Enabling_Component_Packaging Is this approach described in this post the right approach at all for my desired goal? Yes it should work, read the Wiki as well in order to get the big picture. There is one limitation you won't able to overcome for now is the naming scheme makes it impossible to have a component package named: projectname-1.0.0.deb you will always get projectname-1.0.0-compName.deb see this bug/features request: http://public.kitware.com/Bug/view.php?id=12997 and the related ones. Are cpack_add_component_group and cpack_add_install_type mandatory? How do I set the file name for every component respectively package? Nope. If not: Is this even possible with CMake without having to CMakeLists.txt files and changing them for every desired package? I don't understand this? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
On Tue, Nov 27, 2012 at 7:21 AM, Michael Jackson mike.jack...@bluequartz.net wrote: On Nov 27, 2012, at 12:46 AM, Titus von Boxberg ti...@v9g.de wrote: Am 27.11.2012 05:24, schrieb Michael Jackson: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? You could add /MP to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS Regards Titus -- Thanks for the tip. I'll give it a try. I can tell you that sometimes its hard to get Visual Studio to make good use of your cores (especially if you have 8 or 12 threads) even though multithreded building is on. I believe there are too many parts of the chain that are single threaded only. John -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
On 27 November 2012 14:23, John Drescher dresche...@gmail.com wrote: On Tue, Nov 27, 2012 at 7:21 AM, Michael Jackson mike.jack...@bluequartz.net wrote: On Nov 27, 2012, at 12:46 AM, Titus von Boxberg ti...@v9g.de wrote: Am 27.11.2012 05:24, schrieb Michael Jackson: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? You could add /MP to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS Regards Titus -- Thanks for the tip. I'll give it a try. I can tell you that sometimes its hard to get Visual Studio to make good use of your cores (especially if you have 8 or 12 threads) even though multithreded building is on. I believe there are too many parts of the chain that are single threaded only. It's fairly easy to make both, VS and cl.exe, utilise multiple cores, even using command line. The problem is that build configurations like NMAKE require significant gymnastics: http://public.kitware.com/pipermail/cmake/2012-September/052116.html It is easier with VS projects: http://www.cmake.org/pipermail/cmake/2009-April/028669.html Best regards, -- Mateusz Loskot, http://mateusz.loskot.net -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
On Tue, Nov 27, 2012 at 9:41 AM, Mateusz Loskot mate...@loskot.net wrote: On 27 November 2012 14:23, John Drescher dresche...@gmail.com wrote: On Tue, Nov 27, 2012 at 7:21 AM, Michael Jackson mike.jack...@bluequartz.net wrote: On Nov 27, 2012, at 12:46 AM, Titus von Boxberg ti...@v9g.de wrote: Am 27.11.2012 05:24, schrieb Michael Jackson: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? You could add /MP to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS Regards Titus -- Thanks for the tip. I'll give it a try. I can tell you that sometimes its hard to get Visual Studio to make good use of your cores (especially if you have 8 or 12 threads) even though multithreded building is on. I believe there are too many parts of the chain that are single threaded only. It's fairly easy to make both, VS and cl.exe, utilise multiple cores, even using command line. The problem is that build configurations like NMAKE require significant gymnastics: http://public.kitware.com/pipermail/cmake/2012-September/052116.html It is easier with VS projects: http://www.cmake.org/pipermail/cmake/2009-April/028669.html My comment was even though it will do multithreaded builds with VS projects for some projects it will build at very low CPU utilization for long periods while other projects it maxes out at 100% on all 12 cores. John -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
On 27 November 2012 14:47, John Drescher dresche...@gmail.com wrote: On Tue, Nov 27, 2012 at 9:41 AM, Mateusz Loskot mate...@loskot.net wrote: On 27 November 2012 14:23, John Drescher dresche...@gmail.com wrote: On Tue, Nov 27, 2012 at 7:21 AM, Michael Jackson mike.jack...@bluequartz.net wrote: On Nov 27, 2012, at 12:46 AM, Titus von Boxberg ti...@v9g.de wrote: Am 27.11.2012 05:24, schrieb Michael Jackson: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? You could add /MP to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS Regards Titus -- Thanks for the tip. I'll give it a try. I can tell you that sometimes its hard to get Visual Studio to make good use of your cores (especially if you have 8 or 12 threads) even though multithreded building is on. I believe there are too many parts of the chain that are single threaded only. It's fairly easy to make both, VS and cl.exe, utilise multiple cores, even using command line. The problem is that build configurations like NMAKE require significant gymnastics: http://public.kitware.com/pipermail/cmake/2012-September/052116.html It is easier with VS projects: http://www.cmake.org/pipermail/cmake/2009-April/028669.html My comment was even though it will do multithreaded builds with VS projects for some projects it will build at very low CPU utilization for long periods while other projects it maxes out at 100% on all 12 cores. Right, perhaps complex inter-project dependencies halt the processes. -- Mateusz Loskot, http://mateusz.loskot.net -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
Right, perhaps complex inter-project dependencies halt the processes. I believe this is part of the reason. Projects like ITK with hundreds of small utilities tend to utilize the cores after the dependent libraries are built however my code that has very few utilities and significantly more inter-project dependencies do not tend to make good use of the cores. On top of that it appears that VS building slows down significantly as the # of include folders greatly increases. This cuts into CPU utilization when the OS searches your includes for your header files. In the past I have tried to get around the inter-project dependency problem by building Release, Debug and RelWithDebInfo in 3 separate processes only to find that on some builds this did not fix the issue because the OS spent an a large portion of the build time searching the include paths. I even tried to stop this by placing the projects and includes on a RAM disk but even that did not totally fix the issue. John -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPACK: configured variables in CMake file are ignored
Hi Eric. Do you mean that inside CPackConfig.cmake the value you(ve set before INCLUDE(CPack) are not used? That is correct. Am I overlooking something? Not something obvious I think. Could it be possible that INCLUDE(CPack) has been called by a subproject before you actually do it in your main CMakeLists.txt? Nope, there is only one CMakeLists.txt file and the CPack text is at the end of it. Which CPack generator are you using? PackageMaker Not all of them use CPACK_RESOURCE_* vars. Could you try from a fresh build tree in order to avoid potential cache effect. I have deleted the cache and the gemerated CPack files several times without effect. BTW, also the CPACK_PACKAGE_VERSION_MAJOR, CPACK_PACKAGE_VERSION_MINOR, and CPACK_PACKAGE_VERSION_PATCH variables are skipped and those should not be generator-dependent. Cheers. -- Paolo -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] Disable Warning: Manually-specified variables were not used by the project
Hello Is it possible to disable the warning: Manually-specified variables were not used by the project? This warning is nice, but in my case I'm not interessted in and I know that I put some unused variables for certain circumstances. Best SirAnn -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Disable Warning: Manually-specified variables were not used by the project
Hi Sören, Command line option --no-warn-unused-cli should help you. See http://www.cmake.org/cmake/help/v2.8.8/cmake.html#opt:--no-warn-unused-cli and http://www.cmake.org/pipermail/cmake/2011-February/042908.html Hth Jc On Tue, Nov 27, 2012 at 10:10 AM, Sören Textor s.tex...@ditec-gmbh.dewrote: Hello Is it possible to disable the warning: Manually-specified variables were not used by the project? This warning is nice, but in my case I'm not interessted in and I know that I put some unused variables for certain circumstances. Best SirAnn -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/** opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/**CMake_FAQhttp://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/mailman/listinfo/cmake -- +1 919 869 8849 -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
Try ninja, which is available via macports. My primary project uses CMake to create 3 Windows build environments: nmake, VisualStudio, and ninja. In the VS environment I can use msbuild /m project.sln. The ninja environment is about the tastest build that I have available for Windows. Gary Little gglit...@comcast.net C 952-454-4629 H 952-223-1349 Tain't what you want that makes you fat, it's what you get. On Nov 26, 2012, at 10:24 PM, Michael Jackson mike.jack...@bluequartz.net wrote: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? Thanks - Mike Jackson _ Mike Jackson mike.jack...@bluequartz.net BlueQuartz Softwarewww.bluequartz.net Principal Software Engineer Dayton, Ohio On Mon, Nov 26, 2012 at 11:22 PM, Michael Jackson mike.jack...@bluequartz.net wrote: _ Mike Jackson mike.jack...@bluequartz.net BlueQuartz Softwarewww.bluequartz.net Principal Software Engineer Dayton, Ohio -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to get Visual Studio to use more than a single core for compiling
FYI: in any environment, you can use cmake --build . in the build directory to build from the command line. On Tue, Nov 27, 2012 at 10:36 AM, Gary Little gglit...@comcast.net wrote: Try ninja, which is available via macports. My primary project uses CMake to create 3 Windows build environments: nmake, VisualStudio, and ninja. In the VS environment I can use msbuild /m project.sln. The ninja environment is about the tastest build that I have available for Windows. Gary Little gglit...@comcast.net C 952-454-4629 H 952-223-1349 Tain't what you want that makes you fat, it's what you get. On Nov 26, 2012, at 10:24 PM, Michael Jackson mike.jack...@bluequartz.net wrote: That will teach me to hit enter in GMail.. My question is this: What is the magic CMake incantation to get Visual Studio 2010 to use more than a single processor when compiling my project? Thanks - Mike Jackson _ Mike Jackson mike.jack...@bluequartz.net BlueQuartz Softwarewww.bluequartz.net Principal Software Engineer Dayton, Ohio On Mon, Nov 26, 2012 at 11:22 PM, Michael Jackson mike.jack...@bluequartz.net wrote: _ Mike Jackson mike.jack...@bluequartz.net BlueQuartz Softwarewww.bluequartz.net Principal Software Engineer Dayton, Ohio -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPACK: configured variables in CMake file are ignored
2012/11/27 Paolo Ciccone phcicc...@gmail.com: Hi Eric. Do you mean that inside CPackConfig.cmake the value you(ve set before INCLUDE(CPack) are not used? That is correct. So this is plain wrong and I don't understand how it is possible?? We should first find to fix this before examining other issue. You should definitely find the CPACK_xxx values you(ve set in your CMakeLists.txt inside CPackConfig.cmake. Could you send me/us a sample minimalistic project which exhibit the faulty behavior? Which version of CMake/CPack are you using? Could you transcript the exact command you launch when configuring and packaging your project? [...] -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPACK: configured variables in CMake file are ignored
I have prepared a testcase that I can use to replicate the issue all the time. I am running Mac OS 10.8.2 (ML) and I tested this case with both CMake/CPack 2.8.10.1 and 2.8.9. The command issued is simply: cmake -G Xcode You can find the test case, which is stripped down to almost nothing here: https://dl.dropbox.com/u/3701566/cmake_cpack_test.zip Hope this helps. --- Paolo Ciccone www.preta3d.com www.paolociccone.com On Tue, Nov 27, 2012 at 9:41 AM, Eric Noulard eric.noul...@gmail.comwrote: 2012/11/27 Paolo Ciccone phcicc...@gmail.com: Hi Eric. Do you mean that inside CPackConfig.cmake the value you(ve set before INCLUDE(CPack) are not used? That is correct. So this is plain wrong and I don't understand how it is possible?? We should first find to fix this before examining other issue. You should definitely find the CPACK_xxx values you(ve set in your CMakeLists.txt inside CPackConfig.cmake. Could you send me/us a sample minimalistic project which exhibit the faulty behavior? Which version of CMake/CPack are you using? Could you transcript the exact command you launch when configuring and packaging your project? [...] -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] List from strings (CMAKE_CXX_FLAGS and friends)
I'm running into this again, and I trawled through the mailing list, and
according to Bill (4/11/2009 - managing lists with space separated
elements), I should be able to get a list from a string with a single
command.
If you want to convert a string to a list you can do it like this:
set(list ${string})
That will make the space separated list string into a ; separated list. If
you want to keep string a string you need quotes:
set(newstring ${string}).
It doesn't seem to work that way though, so perhaps I'm missing something.
Here's my test program:
function(print_list name)
list(LENGTH ${name} length_of_list)
message(${name} has ${length_of_list} items)
set(count 0)
foreach(i ${${name}})
message(${name}[${count}] = ${i})
math(EXPR count ${count} + 1)
endforeach()
endfunction()
set(mylist a b c)
set(mystring a b c)
set(mylist_from_string ${mystring})
print_list(mylist)
print_list(mystring)
print_list(mylist_from_string)
And here's what I get when I run it:
cmake -P list-from-string.cmake
mylist has 3 items
mylist[0] = a
mylist[1] = b
mylist[2] = c
mystring has 1 items
mystring[0] = a b c
mylist_from_string has 1 items
mylist_from_string[0] = a b c
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Problem with Visual Studio 2010, Windows 7 64bit
I am trying to build VTK for the first time on a 64bit Windows 7 system. I have Visual Studio 2010 installed. I ran the 64bit Visual Studio Command Prompt and ran 'cmake-gui' from it. I pointed it to the VTK source directory and gave it a build directory. When I configure, I get: --- Error in configuration process, project files may be invalid The C compiler identification is MSVC 16.0.30319.1 The CXX compiler identification is MSVC 16.0.30319.1 Check for working C compiler using: Visual Studio 10 Win64 Check for working C compiler using: Visual Studio 10 Win64 -- broken CMake Error at C:/bin/cmake/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:61 (message): The C compiler D:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/x86_amd64/cl.exe is not able to compile a simple test program. It fails with the following output: Change Dir: c:/build/VTK/CMakeFiles/CMakeTmp Run Build Command:d:\PROGRA~2\MICROS~1.0\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec2926210968 Microsoft (R) Visual Studio Version 10.0.30319.1. Copyright (C) Microsoft Corp. All rights reserved. 1-- Build started: Project: cmTryCompileExec2926210968, Configuration: Debug x64 -- 1 Microsoft (R) C/C++ Optimizing Compiler Version 16.00.30319.01 for x64 1 Copyright (C) Microsoft Corporation. All rights reserved. 1 1 cl /c /Zi /W3 /WX- /Od /Ob0 /D WIN32 /D _WINDOWS /D _DEBUG /D CMAKE_INTDIR=\Debug\ /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /FocmTryCompileExec2926210968.dir\Debug\\ /FdC:/build/VTK/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec2926210968.pdb /Gd /TC /errorReport:prompt testCCompiler.c /Zm1000 1 1 testCCompiler.c 1LINK : fatal error LNK1123: failure during conversion to COFF: file invalid or corrupt == Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped == CMake will not be able to correctly generate this project. Call Stack (most recent call first): CMakeLists.txt:3 (project) Configuring incomplete, errors occurred! --- I am using cmake-2.8.10.1. Any suggestions? David -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPACK: configured variables in CMake file are ignored
2012/11/27 Paolo Ciccone phcicc...@gmail.com:
I have prepared a testcase that I can use to replicate the issue all the
time.
I am running Mac OS 10.8.2 (ML) and I tested this case with both CMake/CPack
2.8.10.1 and 2.8.9.
The command issued is simply:
cmake -G Xcode
You can find the test case, which is stripped down to almost nothing here:
https://dl.dropbox.com/u/3701566/cmake_cpack_test.zip
If you open your CMakeLists.txt in an hexadecimal editor you'll see
that you have spurious C2 A0 UTF-8 characters (unbreakable space) at the end of
the following variables:
CPACK_PACKAGE_VENDOR
CPACK_PACKAGE_VERSION_MAJOR
CPACK_PACKAGE_VERSION_MINOR
CPACK_PACKAGE_VERSION_PATCH
CPACK_PACKAGE_DESCRIPTION_SUMMARY
CPACK_RESOURCE_FILE_WELCOME
CPACK_RESOURCE_FILE_README
CPACK_RESOURCE_FILE_LICENSE
so statement like
set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/intro.rtf)
may be puzzling CMake because the extraneous unbreakable space may not be
considered as a separator.
On linux it seems to work but the behavior on the Mac may be different.
Could you try replacing your CMakeLists.txt with the one attached to this mail
and retry.
--
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.org
#
# MyApp
#
cmake_minimum_required(VERSION 2.8)
# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0012
if(POLICY CMP0012)
cmake_policy(SET CMP0012 OLD)
endif()
# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0015
if(POLICY CMP0015)
cmake_policy(SET CMP0015 OLD)
endif()
# Set the project name
PROJECT(My Project)
#
# OS abbreviation
#
IF(APPLE)
SET(OS_CODE M)
ELSEIF(WIN32)
SET(OS_CODE W)
ENDIF()
SET(CMAKE_CONFIGURATION_TYPES Debug;Release CACHE STRING limit configs
FORCE)
#
# Version number
#
SET(MY_VERSION_MAJOR 3)
SET(MY_VERSION_MINOR 0)
SET(MY_VERSION_PATCH 0)
SET(MY_VERSION ${MY_VERSION_MAJOR}.${MY_VERSION_MINOR}.${MY_VERSION_PATCH})
#
# Targets
#
ADD_CUSTOM_TARGET(REBUILD_UI COMMAND echo Rebuilding the UI files...)
#
# Installer
#
INCLUDE(InstallRequiredSystemLibraries)
SET(CPACK_PACKAGE_NAME MyApp ${MY_VERSION_MAJOR} ${HOST_NAME})
SET(CPACK_PACKAGE_VENDOR Pret-a-3D)
SET(CPACK_PACKAGE_VERSION 3.0.0)
SET(CPACK_PACKAGE_VERSION_MAJOR 3)
SET(CPACK_PACKAGE_VERSION_MINOR 0)
SET(CPACK_PACKAGE_VERSION_PATCH 0)
SET(CPACK_PACKAGE_FILE_NAME MyApp_${MY_VERSION_MAJOR}_${HOST_NAME})
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY MyApp 3 for ${HOST_NAME})
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
MyApp ${MY_VERSION_MAJOR}.${MY_VERSION_MINOR})
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/intro.rtf)
IF(APPLE)
SET(CPACK_GENERATOR PackageMaker)
ELSEIF(WIN32)
SET(CPACK_GENERATOR NSIS)
ENDIF()
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY MyApp ${MY_VERSION_MAJOR})
IF(APPLE)
SET(CMAKE_INSTALL_PREFIX /Applications)
SET(CPACK_PACKAGE_INSTALL_DIRECTORY /Applications)
ENDIF()
SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/welcome.txt)
SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/intro.rtf)
SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/welcome.txt)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/license.txt)
INCLUDE(CPack)
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit
Are you using an Express edition of VS without an SDK installed? If so, install an SDK and try again from a clean build directory. If not, we'll need more information. VS 2010 on Windows 7 works great for me, even for a VTK build tree... On Tue, Nov 27, 2012 at 3:48 PM, David Doria daviddo...@gmail.com wrote: I am trying to build VTK for the first time on a 64bit Windows 7 system. I have Visual Studio 2010 installed. I ran the 64bit Visual Studio Command Prompt and ran 'cmake-gui' from it. I pointed it to the VTK source directory and gave it a build directory. When I configure, I get: --- Error in configuration process, project files may be invalid The C compiler identification is MSVC 16.0.30319.1 The CXX compiler identification is MSVC 16.0.30319.1 Check for working C compiler using: Visual Studio 10 Win64 Check for working C compiler using: Visual Studio 10 Win64 -- broken CMake Error at C:/bin/cmake/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:61 (message): The C compiler D:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/x86_amd64/cl.exe is not able to compile a simple test program. It fails with the following output: Change Dir: c:/build/VTK/CMakeFiles/CMakeTmp Run Build Command:d:\PROGRA~2\MICROS~1.0\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec2926210968 Microsoft (R) Visual Studio Version 10.0.30319.1. Copyright (C) Microsoft Corp. All rights reserved. 1-- Build started: Project: cmTryCompileExec2926210968, Configuration: Debug x64 -- 1 Microsoft (R) C/C++ Optimizing Compiler Version 16.00.30319.01 for x64 1 Copyright (C) Microsoft Corporation. All rights reserved. 1 1 cl /c /Zi /W3 /WX- /Od /Ob0 /D WIN32 /D _WINDOWS /D _DEBUG /D CMAKE_INTDIR=\Debug\ /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /FocmTryCompileExec2926210968.dir\Debug\\ /FdC:/build/VTK/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec2926210968.pdb /Gd /TC /errorReport:prompt testCCompiler.c /Zm1000 1 1 testCCompiler.c 1LINK : fatal error LNK1123: failure during conversion to COFF: file invalid or corrupt == Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped == CMake will not be able to correctly generate this project. Call Stack (most recent call first): CMakeLists.txt:3 (project) Configuring incomplete, errors occurred! --- I am using cmake-2.8.10.1. Any suggestions? David -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] CMake 2.8.10.2 available for download
And a few more... Here are some important bug fixes to the CMake 2.8.10 release. Thanks going out to Alex Neundorf, Brad King, Rolf Eike Beer, (and me), … fixes for the following problems are now available in a 2.8.10.2 bug fix release. The change log page for this bug-fix only release is here: http://public.kitware.com/Bug/changelog_page.php?version_id=107 Please use the latest release installers from our download page http://cmake.org/cmake/resources/software.html rather than any previous 2.8.10 builds. Thanks for your continued support! -Dave These are the commits that fixed the problems: Changes in CMake 2.8.10.2 (since 2.8.10.1) -- Alex Neundorf (1): Automoc: fix regression #13667, broken build in phonon Brad King (1): Initialize IMPORTED GLOBAL targets on reconfigure (#13702) David Cole (1): CMake: Fix infinite loop untarring corrupt tar file Rolf Eike Beer (1): FindGettext: fix overwriting result with empty variable (#13691) -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPACK: configured variables in CMake file are ignored
Hi Eric.
You nailed it! Those characters got inserted when I copies and pasted the
names of the variables fromt the CPack wiki. Once removed everything works
perfectly. Fantastic!
Thank you a million.
---
Paolo Ciccone
www.preta3d.com
www.paolociccone.com
On Tue, Nov 27, 2012 at 1:34 PM, Eric Noulard eric.noul...@gmail.comwrote:
2012/11/27 Paolo Ciccone phcicc...@gmail.com:
I have prepared a testcase that I can use to replicate the issue all the
time.
I am running Mac OS 10.8.2 (ML) and I tested this case with both
CMake/CPack
2.8.10.1 and 2.8.9.
The command issued is simply:
cmake -G Xcode
You can find the test case, which is stripped down to almost nothing
here:
https://dl.dropbox.com/u/3701566/cmake_cpack_test.zip
If you open your CMakeLists.txt in an hexadecimal editor you'll see
that you have spurious C2 A0 UTF-8 characters (unbreakable space) at the
end of
the following variables:
CPACK_PACKAGE_VENDOR
CPACK_PACKAGE_VERSION_MAJOR
CPACK_PACKAGE_VERSION_MINOR
CPACK_PACKAGE_VERSION_PATCH
CPACK_PACKAGE_DESCRIPTION_SUMMARY
CPACK_RESOURCE_FILE_WELCOME
CPACK_RESOURCE_FILE_README
CPACK_RESOURCE_FILE_LICENSE
so statement like
set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/intro.rtf)
may be puzzling CMake because the extraneous unbreakable space may not be
considered as a separator.
On linux it seems to work but the behavior on the Mac may be different.
Could you try replacing your CMakeLists.txt with the one attached to this
mail
and retry.
--
Erk
Le gouvernement représentatif n'est pas la démocratie --
http://www.le-message.org
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] Unspecified arguments to CMake script
Is it possible to have an unbounded number of arguments to a script processed by CMake using the -P argument? I need to specify a variable number of arguments, so using -D isn't going to help much. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CPACK: configured variables in CMake file are ignored
Yes. I use Sublime Edit 2 for all my work, Xcode is used just to compile the project. I'll look into that and possibly contact the developer. Showing the foreign chars would have saved me a few hours and avoided pestering the mailing list about such trivial issue :) Thanks again. --- Paolo Ciccone www.preta3d.com www.paolociccone.com On Tue, Nov 27, 2012 at 2:26 PM, Eric Noulard eric.noul...@gmail.comwrote: 2012/11/27 Paolo Ciccone phcicc...@gmail.com: Hi Eric. You nailed it! Those characters got inserted when I copies and pasted the names of the variables fromt the CPack wiki. Once removed everything works perfectly. Fantastic! Happy to ear that. Thank you a million. You're welcome. May be XCode (or the programming editor you use) should have displayed those characters in a different way than classical space, in fact this is how I got my eyes on it. -- Erk Le gouvernement représentatif n'est pas la démocratie -- http://www.le-message.org -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Unspecified arguments to CMake script
It's possible, but it's probably not advisable. The command line argument handling code in CMake is, shall we say, a smidge on the fragile side. It would be better to stream your arguments into a file, perhaps one arg per line in a text file, and then use CMake's file reading capabilities to process that file from within your script. And using -D to indicate the filename to the CMake script... HTH, David On Tue, Nov 27, 2012 at 5:31 PM, James Bigler jamesbig...@gmail.com wrote: Is it possible to have an unbounded number of arguments to a script processed by CMake using the -P argument? I need to specify a variable number of arguments, so using -D isn't going to help much. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] swig - how do I set compile flags on the generated files?
Our normal coding standards requires zero warnings with -wall -wextra (gcc/clang), but often the swig generated file has warnings. We don't mind turning these warnings off for the generated file, but we still want to see them for other files in the project. However I'm stumped on how to do this. Currently I have ADD_DEFINITIONS(-Wno-unused-parameter ...) which works but it disables the warning for non-generated files as well. I understand the right way to do this is by: Set_source_files_property(filename PROPERTIES COMPILE_FLAGS -Wno-unused-parameter ...) However I don't have filename. Instead I have myInputfile.i, which gets turns into something like myInputFilePYTHON_wrap.cxx. Of course I can generate this name, but that seems fragile: if cmake desides to change the file mangling in the future I need to change my algorithm. So the question is either: is there are good way to get the generated filename, or is there a different way I should be doing this? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] swig - how do I set compile flags on the generated files?
Aren't you the one generating those names? http://www.swig.org/Doc1.3/Introduction.html#Introduction%5Fbuild%5Fsystem On 2012-28-11, at 01:11:24 , Miller Henry wrote: Our normal coding standards requires zero warnings with –wall –wextra (gcc/clang), but often the swig generated file has warnings. We don’t mind turning these warnings off for the generated file, but we still want to see them for other files in the project. However I’m stumped on how to do this. Currently I have ADD_DEFINITIONS(-Wno-unused-parameter …) which works but it disables the warning for non-generated files as well. I understand the right way to do this is by: Set_source_files_property(filename PROPERTIES COMPILE_FLAGS “-Wno-unused-parameter …”) However I don’t have filename. Instead I have myInputfile.i, which gets turns into something like myInputFilePYTHON_wrap.cxx. Of course I can generate this name, but that seems fragile: if cmake desides to change the file mangling in the future I need to change my algorithm. So the question is either: is there are good way to get the generated filename, or is there a different way I should be doing this? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] swig - how do I set compile flags on the generated files?
I had a derp, sorry about that. Obviously you don't, hah. You can put all the swig-generated files in a directory, and then perhaps set the properties with a glob? On 2012-28-11, at 02:22:00 , Nick Overdijk wrote: Aren't you the one generating those names? http://www.swig.org/Doc1.3/Introduction.html#Introduction%5Fbuild%5Fsystem On 2012-28-11, at 01:11:24 , Miller Henry wrote: Our normal coding standards requires zero warnings with –wall –wextra (gcc/clang), but often the swig generated file has warnings. We don’t mind turning these warnings off for the generated file, but we still want to see them for other files in the project. However I’m stumped on how to do this. Currently I have ADD_DEFINITIONS(-Wno-unused-parameter …) which works but it disables the warning for non-generated files as well. I understand the right way to do this is by: Set_source_files_property(filename PROPERTIES COMPILE_FLAGS “-Wno-unused-parameter …”) However I don’t have filename. Instead I have myInputfile.i, which gets turns into something like myInputFilePYTHON_wrap.cxx. Of course I can generate this name, but that seems fragile: if cmake desides to change the file mangling in the future I need to change my algorithm. So the question is either: is there are good way to get the generated filename, or is there a different way I should be doing this? -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[CMake] VS2012 Platform Toolset
Hello, With Visual Studio 2012 Update 1 released, I am hoping to build a C++ project to supportWindows XP. Is there a way to use CMake to generate a project that targets Windows XP?Basically CMake would need to generate a project file that uses: Platform Toolset = Visual Studio 2012 - Windows XP (v110_xp). Thanks,Kranar -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit
I have no problems with Visual Studio 2010 or VS 2010 Express. The following link may help: http://www.vtk.org/Wiki/VTK/GitMSBuild There is no need to set the VS 64-bit command prompt and run cmake-gui from inside it. I generally run cmake-gui by just clicking on the icon. Try running cmake-gui directly and not from the command prompt. I am able to build both VTK and the Wiki Examples Ok. I do get problems when running the batch file in the above link but they are related to the MS development environment not VTK. Certainly it seems that building using the IDE seems to go faster. Regards Andrew -- Forwarded message -- From: David Cole david.c...@kitware.com To: David Doria daviddo...@gmail.com Cc: cmake Mailing List cmake@cmake.org Date: Tue, 27 Nov 2012 16:37:31 -0500 Subject: Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit Are you using an Express edition of VS without an SDK installed? If so, install an SDK and try again from a clean build directory. If not, we'll need more information. VS 2010 on Windows 7 works great for me, even for a VTK build tree... On Tue, Nov 27, 2012 at 3:48 PM, David Doria daviddo...@gmail.com wrote: I am trying to build VTK for the first time on a 64bit Windows 7 system. I have Visual Studio 2010 installed. I ran the 64bit Visual Studio Command Prompt and ran 'cmake-gui' from it. I pointed it to the VTK source directory and gave it a build directory. When I configure, I get: --- Error in configuration process, project files may be invalid The C compiler identification is MSVC 16.0.30319.1 The CXX compiler identification is MSVC 16.0.30319.1 Check for working C compiler using: Visual Studio 10 Win64 Check for working C compiler using: Visual Studio 10 Win64 -- broken CMake Error at C:/bin/cmake/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake:61 (message): The C compiler D:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/x86_amd64/cl.exe is not able to compile a simple test program. It fails with the following output: Change Dir: c:/build/VTK/CMakeFiles/CMakeTmp Run Build Command:d:\PROGRA~2\MICROS~1.0\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec2926210968 Microsoft (R) Visual Studio Version 10.0.30319.1. Copyright (C) Microsoft Corp. All rights reserved. 1-- Build started: Project: cmTryCompileExec2926210968, Configuration: Debug x64 -- 1 Microsoft (R) C/C++ Optimizing Compiler Version 16.00.30319.01 for x64 1 Copyright (C) Microsoft Corporation. All rights reserved. 1 1 cl /c /Zi /W3 /WX- /Od /Ob0 /D WIN32 /D _WINDOWS /D _DEBUG /D CMAKE_INTDIR=\Debug\ /D _MBCS /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /FocmTryCompileExec2926210968.dir\Debug\\ /FdC:/build/VTK/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec2926210968.pdb /Gd /TC /errorReport:prompt testCCompiler.c /Zm1000 1 1 testCCompiler.c 1LINK : fatal error LNK1123: failure during conversion to COFF: file invalid or corrupt == Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped == CMake will not be able to correctly generate this project. Call Stack (most recent call first): CMakeLists.txt:3 (project) Configuring incomplete, errors occurred! --- I am using cmake-2.8.10.1. Any suggestions? David -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- ___ Andrew J. P. Maclean ___ -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit
VS 2012 will not cause a problem I have both VS 2010 and VS2012 (both express) installed but am waiting for QT to be able to built for VS2012 before moving to VS2012 express. Regards Andrew -- Forwarded message -- From: David Doria daviddo...@gmail.com To: David Cole david.c...@kitware.com Cc: cmake Mailing List cmake@cmake.org Date: Tue, 27 Nov 2012 21:06:36 -0500 Subject: Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit On Tue, Nov 27, 2012 at 4:37 PM, David Cole david.c...@kitware.com wrote: Are you using an Express edition of VS without an SDK installed? If so, install an SDK and try again from a clean build directory. If not, we'll need more information. VS 2010 on Windows 7 works great for me, even for a VTK build tree... It was not VS Express, but just VS 2010. I also had VS 2012 installed, could that cause a problem? I uninstalled both and reinstalled 2010 and it works fine now. For future reference, what other information could I have provided? The CMakeCache.txt file? David -- ___ Andrew J. P. Maclean ___ -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit
Hi all, VS 2012 and VS 2010 installed together *can* actually cause problems (it certainly did for me). I was getting exactly the same error as David Doria, and I had to install a service pack for 2010 to overcome it. See e.g. http://social.msdn.microsoft.com/Forums/da-DK/vssetup/thread/d10adba0-e082-494a-bb16-2bfc039faa80or http://stackoverflow.com/questions/10888391/link-fatal-error-lnk1123-failure-during-conversion-to-coff-file-invalid-or-c Petr On Wed, Nov 28, 2012 at 4:12 AM, Andrew Maclean andrew.amacl...@gmail.comwrote: VS 2012 will not cause a problem I have both VS 2010 and VS2012 (both express) installed but am waiting for QT to be able to built for VS2012 before moving to VS2012 express. Regards Andrew -- Forwarded message -- From: David Doria daviddo...@gmail.com To: David Cole david.c...@kitware.com Cc: cmake Mailing List cmake@cmake.org Date: Tue, 27 Nov 2012 21:06:36 -0500 Subject: Re: [CMake] Problem with Visual Studio 2010, Windows 7 64bit On Tue, Nov 27, 2012 at 4:37 PM, David Cole david.c...@kitware.com wrote: Are you using an Express edition of VS without an SDK installed? If so, install an SDK and try again from a clean build directory. If not, we'll need more information. VS 2010 on Windows 7 works great for me, even for a VTK build tree... It was not VS Express, but just VS 2010. I also had VS 2012 installed, could that cause a problem? I uninstalled both and reinstalled 2010 and it works fine now. For future reference, what other information could I have provided? The CMakeCache.txt file? David -- ___ Andrew J. P. Maclean ___ -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1073-gf272ccd
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 f272ccd54070949f5f57c00a1566677e627002c8 (commit) via 474d93078d39adea7e739881bb25b7c5b1fe3606 (commit) from 5608dda53247c57b62a107e829281c110378774a (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=f272ccd54070949f5f57c00a1566677e627002c8 commit f272ccd54070949f5f57c00a1566677e627002c8 Merge: 5608dda 474d930 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 08:01:04 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 08:01:04 2012 -0500 Merge topic 'windows-ce' into next 474d930 VS: Fix WCEPlatformParser member order http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=474d93078d39adea7e739881bb25b7c5b1fe3606 commit 474d93078d39adea7e739881bb25b7c5b1fe3606 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 07:59:31 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 27 07:59:31 2012 -0500 VS: Fix WCEPlatformParser member order Declare members in the same order as they are initialized in the constructor. diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h index 60de01e..28061fd 100644 --- a/Source/cmVisualStudioWCEPlatformParser.h +++ b/Source/cmVisualStudioWCEPlatformParser.h @@ -48,8 +48,8 @@ private: std::mapstd::string, std::string Macros; std::vectorstd::string AvailablePlatforms; - bool FoundRequiredName; const char* RequiredName; + bool FoundRequiredName; }; #endif --- Summary of changes: Source/cmVisualStudioWCEPlatformParser.h |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.10.1-1078-g49d1822
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 49d1822f8fa294512c74dc1b3d9ffceef23bef46 (commit)
via bb15f4850b546edca905757c3552b14bc6a7d7e3 (commit)
via ed6f8a4de71d3ff9c4266f55153eb25a49e765b1 (commit)
via f584bd95303ef2238307d7ecfd0bfc439cdcb1c6 (commit)
via e295f73df7bd2542c31f0a7c49006e45e1d0693f (commit)
from f272ccd54070949f5f57c00a1566677e627002c8 (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=49d1822f8fa294512c74dc1b3d9ffceef23bef46
commit 49d1822f8fa294512c74dc1b3d9ffceef23bef46
Merge: f272ccd bb15f48
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 08:02:27 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 08:02:27 2012 -0500
Merge topic 'windows-ce' into next
bb15f48 VS: Added Deploy at project configuration for WindowsCE targets
ed6f8a4 VS: Make DetermineCompilerId working with WinCE too
f584bd9 VS: Allow setting the name of the target platform
e295f73 VS: Add parser for WCE.VCPlatform.config to read WinCE platforms
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb15f4850b546edca905757c3552b14bc6a7d7e3
commit bb15f4850b546edca905757c3552b14bc6a7d7e3
Author: Patrick Gansterer par...@paroga.com
AuthorDate: Fri Sep 14 12:06:57 2012 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Nov 27 08:01:43 2012 -0500
VS: Added Deploy at project configuration for WindowsCE targets
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx
b/Source/cmGlobalVisualStudio71Generator.cxx
index db584b8..2494f55 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -277,7 +277,7 @@ void cmGlobalVisualStudio71Generator
// executables to the libraries it uses are also done here
void cmGlobalVisualStudio71Generator
::WriteProjectConfigurations(
- std::ostream fout, const char* name,
+ std::ostream fout, const char* name, cmTarget::TargetType,
const std::setstd::string configsPartOfDefaultBuild,
const char* platformMapping)
{
diff --git a/Source/cmGlobalVisualStudio71Generator.h
b/Source/cmGlobalVisualStudio71Generator.h
index e9cab06..6d91f97 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -63,7 +63,7 @@ protected:
virtual void WriteProjectDepends(std::ostream fout,
const char* name, const char* path, cmTarget t);
virtual void WriteProjectConfigurations(
-std::ostream fout, const char* name,
+std::ostream fout, const char* name, cmTarget::TargetType type,
const std::setstd::string configsPartOfDefaultBuild,
const char* platformMapping = NULL);
virtual void WriteExternalProject(std::ostream fout,
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index b82a4f4..71d79a1 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -247,7 +247,7 @@ void
cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
std::setstd::string allConfigurations(this-Configurations.begin(),
this-Configurations.end());
this-WriteProjectConfigurations(
-fout, target-GetName(),
+fout, target-GetName(), target-GetType(),
allConfigurations, target-GetProperty(VS_PLATFORM_MAPPING));
}
else
@@ -259,7 +259,7 @@ void
cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
target-GetProperty(GENERATOR_FILE_NAME);
if (vcprojName)
{
-this-WriteProjectConfigurations(fout, vcprojName,
+this-WriteProjectConfigurations(fout, vcprojName, target-GetType(),
configsPartOfDefaultBuild);
}
}
@@ -587,7 +587,7 @@ cmGlobalVisualStudio7Generator
// executables to the libraries it uses are also done here
void cmGlobalVisualStudio7Generator
::WriteProjectConfigurations(
- std::ostream fout, const char* name,
+ std::ostream fout, const char* name, cmTarget::TargetType,
const std::setstd::string configsPartOfDefaultBuild,
const char* platformMapping)
{
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index 9eb9687..6e78620 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -108,7 +108,7 @@ protected:
virtual void WriteProjectDepends(std::ostream fout,
const char* name, const char* path, cmTarget t);
virtual void
[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1080-g1026cf2
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 1026cf2f724b1ad7cc712de53e14ab636318b07d (commit)
via aa335eefba95781030075162542ac64290c25164 (commit)
from 49d1822f8fa294512c74dc1b3d9ffceef23bef46 (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=1026cf2f724b1ad7cc712de53e14ab636318b07d
commit 1026cf2f724b1ad7cc712de53e14ab636318b07d
Merge: 49d1822 aa335ee
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 08:31:03 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 08:31:03 2012 -0500
Merge topic 'windows-ce' into next
aa335ee VS: Fix WCEPlatformParser local shadowing parameter
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa335eefba95781030075162542ac64290c25164
commit aa335eefba95781030075162542ac64290c25164
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 08:30:14 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Nov 27 08:30:14 2012 -0500
VS: Fix WCEPlatformParser local shadowing parameter
diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx
b/Source/cmVisualStudioWCEPlatformParser.cxx
index 270ee0c..0afcf67 100644
--- a/Source/cmVisualStudioWCEPlatformParser.cxx
+++ b/Source/cmVisualStudioWCEPlatformParser.cxx
@@ -73,24 +73,24 @@ void cmVisualStudioWCEPlatformParser::StartElement(const
char* name,
if(strcmp(name, Macro) == 0)
{
-std::string name;
-std::string value;
+std::string macroName;
+std::string macroValue;
for(const char** attr = attributes; *attr; attr += 2)
{
if(strcmp(attr[0], Name) == 0)
{
-name = attr[1];
+macroName = attr[1];
}
else if(strcmp(attr[0], Value) == 0)
{
-value = attr[1];
+macroValue = attr[1];
}
}
-if(!name.empty())
+if(!macroName.empty())
{
- this-Macros[name] = value;
+ this-Macros[macroName] = macroValue;
}
}
}
---
Summary of changes:
Source/cmVisualStudioWCEPlatformParser.cxx | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1087-ga7423f9
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 a7423f9d55fb0f40318096d3b106d5bcad161115 (commit)
via 4960e9183429ea9f8a426d3adbd75c7ecab49fb5 (commit)
from eb7dd113fdad7fe38a516f2c325718d320a8d3e2 (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=a7423f9d55fb0f40318096d3b106d5bcad161115
commit a7423f9d55fb0f40318096d3b106d5bcad161115
Merge: eb7dd11 4960e91
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 08:32:33 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 08:32:33 2012 -0500
Merge topic 'FindOpenGL-require-include' into next
4960e91 FindOpenGL: Require GL/gl.h to be found (#13746)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4960e9183429ea9f8a426d3adbd75c7ecab49fb5
commit 4960e9183429ea9f8a426d3adbd75c7ecab49fb5
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 08:22:30 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Nov 27 08:25:38 2012 -0500
FindOpenGL: Require GL/gl.h to be found (#13746)
Previously we required only OPENGL_gl_LIBRARY to set OpenGL_FOUND.
Obviously projects need OPENGL_INCLUDE_DIR too in order to use the
package.
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 4a393f2..62cbcd9 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -150,7 +150,7 @@ set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
# handle the QUIETLY and REQUIRED arguments and set OPENGL_FOUND to TRUE if
# all listed variables are TRUE
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY
OPENGL_INCLUDE_DIR)
mark_as_advanced(
OPENGL_INCLUDE_DIR
---
Summary of changes:
Modules/FindOpenGL.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.10.1-1090-g3e40be7
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 3e40be7854187a1d81deaf4723ef3d6c8fa8d210 (commit)
via da1d9bac63d486d430b0c61ee8d3928f8d09ab26 (commit)
via b96f6fc2aabed8a77cd45c0f87af7abb6a687576 (commit)
from a7423f9d55fb0f40318096d3b106d5bcad161115 (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=3e40be7854187a1d81deaf4723ef3d6c8fa8d210
commit 3e40be7854187a1d81deaf4723ef3d6c8fa8d210
Merge: a7423f9 da1d9ba
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 08:46:39 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 08:46:39 2012 -0500
Merge topic 'multiarch-include' into next
da1d9ba Test find_path multiarch support (#13742)
b96f6fc Teach find_(path|file) about Linux multiarch (#13742)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da1d9bac63d486d430b0c61ee8d3928f8d09ab26
commit da1d9bac63d486d430b0c61ee8d3928f8d09ab26
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Nov 26 17:01:43 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Nov 26 17:06:12 2012 -0500
Test find_path multiarch support (#13742)
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 1b4ebc4..be7ddbc 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -32,6 +32,7 @@ add_CMakeOnly_test(SelectLibraryConfigurations)
add_CMakeOnly_test(TargetScope)
add_CMakeOnly_test(find_library)
+add_CMakeOnly_test(find_path)
add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND}
-DTEST=ProjectInclude
diff --git a/Tests/CMakeOnly/find_path/CMakeLists.txt
b/Tests/CMakeOnly/find_path/CMakeLists.txt
new file mode 100644
index 000..0e64ed4
--- /dev/null
+++ b/Tests/CMakeOnly/find_path/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 2.8)
+project(FindPathTest NONE)
+
+set(CMAKE_FIND_DEBUG_MODE 1)
+
+macro(test_find_path expected)
+ unset(HDR CACHE)
+ find_path(HDR ${ARGN}
+NO_CMAKE_ENVIRONMENT_PATH
+NO_SYSTEM_ENVIRONMENT_PATH
+)
+ if(HDR)
+# Convert to relative path for comparison to expected location.
+file(RELATIVE_PATH REL_HDR ${CMAKE_CURRENT_SOURCE_DIR} ${HDR})
+
+# Check and report failure.
+if(NOT ${REL_HDR} STREQUAL ${expected})
+ message(SEND_ERROR Header ${expected} found as [${REL_HDR}])
+elseif(CMAKE_FIND_DEBUG_MODE)
+ message(STATUS Header ${expected} found as [${REL_HDR}])
+endif()
+ else()
+message(SEND_ERROR Header ${expected} NOT FOUND)
+ endif()
+endmacro()
+
+set(CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_LIBRARY_ARCHITECTURE arch)
+
+test_find_path(include NAMES test1.h)
+test_find_path(include/arch NAMES test1arch.h)
diff --git a/Tests/CMakeOnly/find_path/include/arch/test1arch.h
b/Tests/CMakeOnly/find_path/include/arch/test1arch.h
new file mode 100644
index 000..e69de29
diff --git a/Tests/CMakeOnly/find_path/include/test1.h
b/Tests/CMakeOnly/find_path/include/test1.h
new file mode 100644
index 000..e69de29
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b96f6fc2aabed8a77cd45c0f87af7abb6a687576
commit b96f6fc2aabed8a77cd45c0f87af7abb6a687576
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Nov 26 16:44:56 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Nov 26 16:46:04 2012 -0500
Teach find_(path|file) about Linux multiarch (#13742)
Implement support for multiarch include directories as specified here:
https://wiki.ubuntu.com/MultiarchCross
Generalize the multiarch feature added in commit b41ad3b3 (Teach
find_(library|package) about Linux multiarch, 2011-06-08) to the
find_path and find_file commands. Teach them to search
prefix/include/arch whenever they would search prefix/include.
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 1de3982..7ce0032 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -360,13 +360,13 @@ void cmFindBase::AddPrefixPaths(std::vectorstd::string
const in_paths,
{
dir += /;
}
-if(subdir == lib)
+if(subdir == include || subdir == lib)
{
const char* arch =
this-Makefile-GetDefinition(CMAKE_LIBRARY_ARCHITECTURE);
if(arch *arch)
{
-this-AddPathInternal(dir+lib/+arch, pathType);
+this-AddPathInternal(dir+subdir+/+arch, pathType);
}
}
std::string add = dir + subdir;
diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx
index 9524924..6a43298 100644
---
[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1095-g18a73fc
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 18a73fce79476bdd5668c6917df358ef61853f7d (commit)
via 69f962b1b2b853589e3920d9213817592233bc63 (commit)
from bcc2698674653f497dc99c5005882ea1674a085b (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=18a73fce79476bdd5668c6917df358ef61853f7d
commit 18a73fce79476bdd5668c6917df358ef61853f7d
Merge: bcc2698 69f962b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 11:13:23 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 11:13:23 2012 -0500
Merge topic 'FindOpenGL-require-include' into next
69f962b Revert FindOpenGL: Require GL/gl.h to be found (#13746)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69f962b1b2b853589e3920d9213817592233bc63
commit 69f962b1b2b853589e3920d9213817592233bc63
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 11:13:07 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Nov 27 11:13:07 2012 -0500
Revert FindOpenGL: Require GL/gl.h to be found (#13746)
This reverts commit 4960e9183429ea9f8a426d3adbd75c7ecab49fb5.
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 62cbcd9..4a393f2 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -150,7 +150,7 @@ set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
# handle the QUIETLY and REQUIRED arguments and set OPENGL_FOUND to TRUE if
# all listed variables are TRUE
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY
OPENGL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY)
mark_as_advanced(
OPENGL_INCLUDE_DIR
---
Summary of changes:
Modules/FindOpenGL.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, master, updated. v2.8.10.1-203-g7e5f1e2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 7e5f1e2cbd7469502087302d1bc7fafd9fa6 (commit) via a7be25341836e928f471f5fd79a1c3473e491eb6 (commit) from 075e0daabc4068f0a67c073dfceaf2796ba0ae15 (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=7e5f1e2cbd7469502087302d1bc7fafd9fa6 commit 7e5f1e2cbd7469502087302d1bc7fafd9fa6 Merge: 075e0da a7be253 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:33:56 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:33:56 2012 -0500 Merge topic 'fix-FindGettext-result' a7be253 FindGettext: fix overwriting result with empty variable (#13691) --- Summary of changes: Modules/FindGettext.cmake |2 -- 1 files changed, 0 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, master, updated. v2.8.10.1-205-g805c0f3
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 805c0f3f899413efe466eee06f46a1b4a3cb285a (commit) via 37c34d7d7b7b32c0f6c00acbb3375c79e42a5587 (commit) from 7e5f1e2cbd7469502087302d1bc7fafd9fa6 (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=805c0f3f899413efe466eee06f46a1b4a3cb285a commit 805c0f3f899413efe466eee06f46a1b4a3cb285a Merge: 7e5f1e2 37c34d7 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:07 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:07 2012 -0500 Merge topic 'fix-untar-infinite-loop' 37c34d7 CMake: Fix infinite loop untarring corrupt tar file --- Summary of changes: Source/cmSystemTools.cxx |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, master, updated. v2.8.10.1-208-gf30393e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 (commit) via 6ff730a4983d15f3e115a919eb18d866f8c65507 (commit) via 51da766a6d85397f9244f5ec426091848d9318ff (commit) from 805c0f3f899413efe466eee06f46a1b4a3cb285a (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=f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 commit f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 Merge: 805c0f3 6ff730a Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:13 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:13 2012 -0500 Merge topic 'cpack-nsis64-patches' 6ff730a CPack/NSIS: Add support for 64-bit NSIS (#13203) 51da766 CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202) --- Summary of changes: Modules/NSIS.template.in |7 +-- Source/CPack/cmCPackGeneratorFactory.cxx |2 ++ Source/CPack/cmCPackNSISGenerator.cxx| 18 +- Source/CPack/cmCPackNSISGenerator.h |7 ++- 4 files changed, 30 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, master, updated. v2.8.10.1-210-g9e395fe
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 9e395feb466145617376eae4013755f684be3f80 (commit) via 12ab1354fcd9fb1ddc3611615ed3d6053afcd5f4 (commit) from f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 (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=9e395feb466145617376eae4013755f684be3f80 commit 9e395feb466145617376eae4013755f684be3f80 Merge: f30393e 12ab135 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:21 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:21 2012 -0500 Merge topic 'ninja-encode-LINK_FLAGS' 12ab135 Ninja: encode LINK_FLAGS to handle bash variables --- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx |3 +++ 1 files changed, 3 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, master, updated. v2.8.10.1-212-g4046fc0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 4046fc01041e1bd9ece928bd77d494c38cc0c70a (commit) via ddc052052b05d6daea0791efd2e1b97a9349a5e9 (commit) from 9e395feb466145617376eae4013755f684be3f80 (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=4046fc01041e1bd9ece928bd77d494c38cc0c70a commit 4046fc01041e1bd9ece928bd77d494c38cc0c70a Merge: 9e395fe ddc0520 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:25 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:25 2012 -0500 Merge topic 'use-cmsys-auto_ptr' ddc0520 Always use the auto_ptr from cmsys. --- Summary of changes: Source/CPack/cmCPackGenerator.cxx |3 +-- Source/CPack/cpack.cxx |3 +-- Source/CTest/cmCTestTestHandler.cxx |3 +-- Source/cmGraphVizWriter.cxx |4 +--- Source/cmLocalUnixMakefileGenerator3.cxx|1 - Source/cmMakefileLibraryTargetGenerator.cxx |2 -- Source/cmSystemTools.cxx|1 - Source/cmake.cxx| 18 -- 8 files changed, 12 insertions(+), 23 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, master, updated. v2.8.10.1-215-g9c48fc7
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 9c48fc7213c2a7426a2c1713653484aa58beebcb (commit) via 7ae7d6650344f7a36216af8424abbf0b834688d1 (commit) via 078e35defbe6e0ee3b216dd2e83ca85d49920fc3 (commit) from 4046fc01041e1bd9ece928bd77d494c38cc0c70a (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=9c48fc7213c2a7426a2c1713653484aa58beebcb commit 9c48fc7213c2a7426a2c1713653484aa58beebcb Merge: 4046fc0 7ae7d66 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:31 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:31 2012 -0500 Merge topic 'fix-13392-nmake-empty-depends-problem' 7ae7d66 NMake: Fix problem with empty DEPENDS args (#13392) 078e35d NMake: Add a test to demonstrate EmptyDepends issue (#13392) --- Summary of changes: Source/cmLocalGenerator.cxx |8 Tests/CMakeLists.txt |2 ++ Tests/EmptyDepends/CMakeLists.txt | 15 +++ 3 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 Tests/EmptyDepends/CMakeLists.txt 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, master, updated. v2.8.10.1-219-g9f83203
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 9f832033d587d4f98b6a1b70674778acd91b8146 (commit) via 0bbae6f95f55f23b758780f771bf4dd560ac2c07 (commit) via d5cf644ac2e3f035d2d3413dd98aa0d46f9f27eb (commit) via d8a59ea4b370eaf4a5b6162631af9e272fdb24b4 (commit) from 9c48fc7213c2a7426a2c1713653484aa58beebcb (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=9f832033d587d4f98b6a1b70674778acd91b8146 commit 9f832033d587d4f98b6a1b70674778acd91b8146 Merge: 9c48fc7 0bbae6f Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:36 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:36 2012 -0500 Merge topic 'revert-use-generator-target' 0bbae6f Revert Move GetLinkInformation to cmGeneratorTarget d5cf644 Split link information processing into two steps. d8a59ea Port cmGeneratorExpression to cmTarget from cmGeneratorTarget. --- Summary of changes: Source/cmGeneratorExpression.cxx |2 +- Source/cmGeneratorExpression.h |3 +- Source/cmGeneratorExpressionEvaluator.cxx |4 +- Source/cmGeneratorExpressionEvaluator.h|3 +- Source/cmGeneratorTarget.cxx | 42 +- Source/cmGeneratorTarget.h |6 --- Source/cmGlobalXCodeGenerator.cxx |3 +- Source/cmInstallTargetGenerator.cxx| 30 ++--- Source/cmInstallTargetGenerator.h |5 +-- Source/cmLocalGenerator.cxx|2 +- Source/cmLocalVisualStudio6Generator.cxx |4 +- Source/cmLocalVisualStudio7Generator.cxx |8 +--- Source/cmMakefileTargetGenerator.cxx |6 +-- Source/cmNinjaTargetGenerator.cxx |2 +- Source/cmTarget.cxx| 64 +++- Source/cmTarget.h | 14 ++ Source/cmVisualStudio10TargetGenerator.cxx |2 +- 17 files changed, 97 insertions(+), 103 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, master, updated. v2.8.10.1-221-gccf23f2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via ccf23f295cb675cded7878273e932723cf411c61 (commit) via 00e96808aa3729a6b385818643249ea2130cbef1 (commit) from 9f832033d587d4f98b6a1b70674778acd91b8146 (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=ccf23f295cb675cded7878273e932723cf411c61 commit ccf23f295cb675cded7878273e932723cf411c61 Merge: 9f83203 00e9680 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:40 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:40 2012 -0500 Merge topic 'fix-13611-source-group-issues' 00e9680 CMake: source_group needs to check its own regex after its children (#13611) --- Summary of changes: Source/cmSourceGroup.cxx |9 + 1 files changed, 5 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, master, updated. v2.8.10.1-223-g370a7c5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 370a7c5f8ca8fe3bb1a1889bdab7e86e78b954c2 (commit) via 51af1da3d21b95540888d585fccdaa8d68d1fdd8 (commit) from ccf23f295cb675cded7878273e932723cf411c61 (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=370a7c5f8ca8fe3bb1a1889bdab7e86e78b954c2 commit 370a7c5f8ca8fe3bb1a1889bdab7e86e78b954c2 Merge: ccf23f2 51af1da Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:46 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:46 2012 -0500 Merge topic 'fix-12437-remove-ridiculously-large-default-stack-size-arg' 51af1da CMake: Remove /STACK:1000 from default linker flags (#12437) --- Summary of changes: Modules/Platform/Windows-Intel.cmake |2 +- Modules/Platform/Windows-MSVC.cmake |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, master, updated. v2.8.10.1-225-gdcb3701
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via dcb3701d76810b2bb7a4f498e4fe2fd925a57028 (commit) via f180b24ef43d48fcec265656ee73ab9130fe39bd (commit) from 370a7c5f8ca8fe3bb1a1889bdab7e86e78b954c2 (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=dcb3701d76810b2bb7a4f498e4fe2fd925a57028 commit dcb3701d76810b2bb7a4f498e4fe2fd925a57028 Merge: 370a7c5 f180b24 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:51 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:51 2012 -0500 Merge topic 'FindBullet-windows-configs' f180b24 FindBullet: Search in per-config dirs on Windows (#13738) --- Summary of changes: Modules/FindBullet.cmake |2 ++ 1 files changed, 2 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, master, updated. v2.8.10.1-228-gd5adbbc
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via d5adbbcf9cf7443392a38eb980886833de104826 (commit) via df293368933ce5698f62a359e3f2d244a60c33be (commit) via e593f8a1cf8d8f757e6630148a37dc77cdf8eaf1 (commit) from dcb3701d76810b2bb7a4f498e4fe2fd925a57028 (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=d5adbbcf9cf7443392a38eb980886833de104826 commit d5adbbcf9cf7443392a38eb980886833de104826 Merge: dcb3701 df29336 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:34:57 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Nov 27 13:34:57 2012 -0500 Merge topic 'winflexbison' df29336 FindFLEX: Add support for the Win flex-bison distribution e593f8a FindBISON: Add support for the Win flex-bison distribution --- Summary of changes: Modules/FindBISON.cmake |2 +- Modules/FindFLEX.cmake | 10 ++ 2 files changed, 7 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, master, updated. v2.8.10.1-232-g5f30a56
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project CMake.
The branch, master has been updated
via 5f30a56f290acd7abd805e32f7537957ae78377d (commit)
via b581be07672e08cce4c29fa279b250d8e9c7aaba (commit)
via 07749e3705cfc0105399c4a7a8349ec9f83ba39c (commit)
via ee96dc76864b899684d62b51edd87d3083e80168 (commit)
from d5adbbcf9cf7443392a38eb980886833de104826 (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=5f30a56f290acd7abd805e32f7537957ae78377d
commit 5f30a56f290acd7abd805e32f7537957ae78377d
Merge: d5adbbc b581be0
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Nov 27 13:35:02 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 13:35:02 2012 -0500
Merge topic 'generator-expression-fixes'
b581be0 Genex: Don't segfault on $FOO,
07749e3 Genex: Ensure that $0:... has a parameter.
ee96dc7 Genex: Extract a method to parse parameters.
---
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 37 ++--
Source/cmGeneratorExpressionEvaluator.h|8
Source/cmGeneratorExpressionParser.cxx | 10 +-
.../{BadAND-result.txt = BadZero-result.txt} |0
.../GeneratorExpression/BadZero-stderr.txt | 17 +
Tests/RunCMake/GeneratorExpression/BadZero.cmake |5 +++
.../GeneratorExpression/RunCMakeTest.cmake |1 +
7 files changed, 74 insertions(+), 4 deletions(-)
copy Tests/RunCMake/GeneratorExpression/{BadAND-result.txt =
BadZero-result.txt} (100%)
create mode 100644 Tests/RunCMake/GeneratorExpression/BadZero-stderr.txt
create mode 100644 Tests/RunCMake/GeneratorExpression/BadZero.cmake
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, master, updated. v2.8.10.1-238-gba139c5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via ba139c5722c338e30f77aa0d09d17da180474f32 (commit) via 1d3b35fd8a59c6f987b4caab17330955dbaf32bc (commit) via 82b077395dad015e0af6c11cec12a3daa7b03cb1 (commit) via 84740c744863314effa7bf1ad32eeb2e9ae79036 (commit) via c8c17454958ea890b9ddb179ef2bca273d30f929 (commit) via 4d078ab46074f305ccbcca0359f8b7d0636bf1f3 (commit) from 5f30a56f290acd7abd805e32f7537957ae78377d (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 - --- Summary of changes: ChangeLog.manual | 14 ++ 1 files changed, 14 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.10.1-1111-g8d89154
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 8d8915423b84b6715829cc8725b9b1fece63a729 (commit) via ba139c5722c338e30f77aa0d09d17da180474f32 (commit) via 61da2e24ac4055d2b8f4c406c52175aecaf51f74 (commit) via 5f30a56f290acd7abd805e32f7537957ae78377d (commit) via d5adbbcf9cf7443392a38eb980886833de104826 (commit) via dcb3701d76810b2bb7a4f498e4fe2fd925a57028 (commit) via 370a7c5f8ca8fe3bb1a1889bdab7e86e78b954c2 (commit) via ccf23f295cb675cded7878273e932723cf411c61 (commit) via 9f832033d587d4f98b6a1b70674778acd91b8146 (commit) via 9c48fc7213c2a7426a2c1713653484aa58beebcb (commit) via 4046fc01041e1bd9ece928bd77d494c38cc0c70a (commit) via 9e395feb466145617376eae4013755f684be3f80 (commit) via f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 (commit) via 805c0f3f899413efe466eee06f46a1b4a3cb285a (commit) via 7e5f1e2cbd7469502087302d1bc7fafd9fa6 (commit) via 075e0daabc4068f0a67c073dfceaf2796ba0ae15 (commit) from 18a73fce79476bdd5668c6917df358ef61853f7d (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=8d8915423b84b6715829cc8725b9b1fece63a729 commit 8d8915423b84b6715829cc8725b9b1fece63a729 Merge: 61da2e2 ba139c5 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:38:23 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 27 13:38:23 2012 -0500 Merge branch 'master' into next http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61da2e24ac4055d2b8f4c406c52175aecaf51f74 commit 61da2e24ac4055d2b8f4c406c52175aecaf51f74 Merge: 18a73fc 5f30a56 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Nov 27 13:37:59 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Nov 27 13:37:59 2012 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.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, release, updated. v2.8.10.1-9-g1d3b35f
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, release has been updated via 1d3b35fd8a59c6f987b4caab17330955dbaf32bc (commit) via 82b077395dad015e0af6c11cec12a3daa7b03cb1 (commit) via 37c34d7d7b7b32c0f6c00acbb3375c79e42a5587 (commit) via 84740c744863314effa7bf1ad32eeb2e9ae79036 (commit) via c8c17454958ea890b9ddb179ef2bca273d30f929 (commit) via 4d078ab46074f305ccbcca0359f8b7d0636bf1f3 (commit) via a7be25341836e928f471f5fd79a1c3473e491eb6 (commit) via d2536579d51e77827b8e55f39123316324314781 (commit) via 5ff75873a98fa9f35a80cc7dc092964d0504de8f (commit) from 902ab6b5652a1858762696b8271c5a52e29aa041 (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 - --- Summary of changes: ChangeLog.manual | 14 ++ Modules/FindGettext.cmake|2 - Source/CMakeVersion.cmake|2 +- Source/cmGlobalGenerator.cxx |1 + Source/cmQtAutomoc.cxx | 59 ++ Source/cmSystemTools.cxx |7 +++- 6 files changed, 80 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, maint, updated. v2.8.10.2
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, maint has been updated via 1d3b35fd8a59c6f987b4caab17330955dbaf32bc (commit) via 82b077395dad015e0af6c11cec12a3daa7b03cb1 (commit) via 37c34d7d7b7b32c0f6c00acbb3375c79e42a5587 (commit) via 84740c744863314effa7bf1ad32eeb2e9ae79036 (commit) via c8c17454958ea890b9ddb179ef2bca273d30f929 (commit) via 4d078ab46074f305ccbcca0359f8b7d0636bf1f3 (commit) via a7be25341836e928f471f5fd79a1c3473e491eb6 (commit) via d2536579d51e77827b8e55f39123316324314781 (commit) via 5ff75873a98fa9f35a80cc7dc092964d0504de8f (commit) from 902ab6b5652a1858762696b8271c5a52e29aa041 (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 - --- Summary of changes: ChangeLog.manual | 14 ++ Modules/FindGettext.cmake|2 - Source/CMakeVersion.cmake|2 +- Source/cmGlobalGenerator.cxx |1 + Source/cmQtAutomoc.cxx | 59 ++ Source/cmSystemTools.cxx |7 +++- 6 files changed, 80 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 annotated tag, v2.8.10.2, created. v2.8.10.2
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 annotated tag, v2.8.10.2 has been created at 32a77ec2a632804359b013e46acab98bdc61c2a0 (tag) tagging 1d3b35fd8a59c6f987b4caab17330955dbaf32bc (commit) replaces v2.8.10.1 tagged by Brad King on Tue Nov 27 13:41:22 2012 -0500 - Log - CMake 2.8.10.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQtQlSAAoJEOyP7zp7+07a1tIP/3ObMPrDm5iH519+RSD06BnW Ffj/QdCs/niSijk4uJ+fLUa/7xxc06pUVUm1p4C3zIOuCQB1TBA/Cn6hK6x7pu+f nFmRzWcclIlSNLHpDRodb0XV+9xH7NtBXPchLL2FVR2jlrkZthVMan3mdQmRca4u IF1DxVFcpfgr14Agm+tTTrfxWR15qJcJk7bKP0CGBZfkWn8a0Q9Dh7rsWiy8XRm5 KPgEE7Zb2afoxM/r+wTc17uNriF+NAcvyB+lcEuoo5PW2+Mw8fGAYUkWnFjN801A EfIruDOlI7ng2jaFcanNBalGDWPpSEHhdlzLa7B0WzO/pbq1cimRLTvokmWr1xpA 8ckli5Q3J9CHPbHc17XtuVaVTIogjSCSqoqt68qyseX4wHQkBDiZK4zb91OKLEza KB1RmVDJektOtWh9NIAdzFLtC7vibLj+wZ8FLn44k0HOusSW7jvReP1xwL7idylT rwF7d/3Ko4vox2dKIO6QfGkLcnuntujf22A4UWNHthLYdp+7wH2eRUzMeVmDjBkr q3kOkB7jh9rk5NKIXlmt9QGi56RDGacL2GGCubXZ1abo/w7wtrPlVKUhYe2eOVbY KVR1HjCSdkDXZBVbTpsmhWNtNhu9CHISwbBaI1xojzMwSejQN/VfGzOoiuL8vwY6 HHutygQXrQ9dn8LD4HZ1 =zecY -END PGP SIGNATURE- Alex Neundorf (1): Automoc: fix regression #13667, broken build in phonon Brad King (6): Initialize IMPORTED GLOBAL targets on reconfigure (#13702) Merge branch 'FixAutomocRegression3' into release Merge branch 'fix-IMPORTED-GLOBAL-reconfigure' into release Merge branch 'fix-FindGettext-result' into release Merge branch 'fix-untar-infinite-loop' into release CMake 2.8.10.2 David Cole (1): CMake: Fix infinite loop untarring corrupt tar file Rolf Eike Beer (1): FindGettext: fix overwriting result with empty variable (#13691) --- 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.10.2-1104-g6692827
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 6692827ddf62611acf96feb896c3a8ac00f5c7a8 (commit)
via 576c22667017ae30d0616c78de9ab967bf3f03a5 (commit)
from 8d8915423b84b6715829cc8725b9b1fece63a729 (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=6692827ddf62611acf96feb896c3a8ac00f5c7a8
commit 6692827ddf62611acf96feb896c3a8ac00f5c7a8
Merge: 8d89154 576c226
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Nov 27 18:12:35 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 27 18:12:35 2012 -0500
Merge topic 'tll-set-include-and-defines-requirements' into next
576c226 Don't clear the pointer vector without first deleting the entries.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=576c22667017ae30d0616c78de9ab967bf3f03a5
commit 576c22667017ae30d0616c78de9ab967bf3f03a5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Nov 28 00:06:59 2012 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Nov 28 00:11:05 2012 +0100
Don't clear the pointer vector without first deleting the entries.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 77571e8..3a22d73 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2483,6 +2483,20 @@ void cmTarget::GatherDependencies( const cmMakefile mf,
}
//
+void deleteAndClear(
+ std::vectorcmTargetInternals::IncludeDirectoriesEntry* entries)
+{
+ for (std::vectorcmTargetInternals::IncludeDirectoriesEntry*::const_iterator
+ it = entries.begin(),
+ end = entries.end();
+ it != end; ++it)
+{
+ delete *it;
+}
+ entries.clear();
+}
+
+//
void cmTarget::SetProperty(const char* prop, const char* value)
{
if (!prop)
@@ -2494,7 +2508,7 @@ void cmTarget::SetProperty(const char* prop, const char*
value)
{
cmListFileBacktrace lfbt;
cmGeneratorExpression ge(lfbt);
-this-Internal-IncludeDirectoriesEntries.clear();
+deleteAndClear(this-Internal-IncludeDirectoriesEntries);
cmsys::auto_ptrcmCompiledGeneratorExpression cge = ge.Parse(value);
this-Internal-IncludeDirectoriesEntries.push_back(
new cmTargetInternals::IncludeDirectoriesEntry(cge));
@@ -5255,13 +5269,7 @@ cmTargetInternalPointer
//
cmTargetInternalPointer::~cmTargetInternalPointer()
{
- for (std::vectorcmTargetInternals::IncludeDirectoriesEntry*::const_iterator
- it = this-Pointer-IncludeDirectoriesEntries.begin(),
- end = this-Pointer-IncludeDirectoriesEntries.end();
- it != end; ++it)
-{
-delete *it;
-}
+ deleteAndClear(this-Pointer-IncludeDirectoriesEntries);
delete this-Pointer;
}
---
Summary of changes:
Source/cmTarget.cxx | 24
1 files changed, 16 insertions(+), 8 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, master, updated. v2.8.10.2-230-g1ed0464
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project CMake. The branch, master has been updated via 1ed04648519f8dad60dbe6c1b3952429a011eb4b (commit) from ba139c5722c338e30f77aa0d09d17da180474f32 (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=1ed04648519f8dad60dbe6c1b3952429a011eb4b commit 1ed04648519f8dad60dbe6c1b3952429a011eb4b Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Nov 28 00:01:06 2012 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Nov 28 00:01:06 2012 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index be8259d..a7afa52 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 10) -set(CMake_VERSION_TWEAK 20121127) +set(CMake_VERSION_TWEAK 20121128) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.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
