[cmake-developers] [CMake 0014676]: cmake --find-package summary ticket
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14676 == Reported By:Alex Neundorf Assigned To:Alex Neundorf == Project:CMake Issue ID: 14676 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: assigned == Date Submitted: 2014-01-01 12:20 EST Last Modified: 2014-01-01 12:20 EST == Summary:cmake --find-package summary ticket Description: This ticket is just used as a place to collect all tickets related to the cmake --find-package mode. == Issue History Date ModifiedUsername FieldChange == 2014-01-01 12:20 Alex Neundorf New Issue 2014-01-01 12:20 Alex Neundorf Status new = assigned 2014-01-01 12:20 Alex Neundorf Assigned To = Alex Neundorf == -- 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 0014677]: cpack gives archive_read_disk_entry_from_file: Can't lstat file
The following issue has been SUBMITTED.
==
http://cmake.org/Bug/view.php?id=14677
==
Reported By:Clinton Stimpson
Assigned To:
==
Project:CMake
Issue ID: 14677
Category: CPack
Reproducibility:always
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2014-01-01 14:19 EST
Last Modified: 2014-01-01 14:19 EST
==
Summary:cpack gives archive_read_disk_entry_from_file: Can't
lstat file
Description:
CPack archive generator gives an error when using these two settings together.
set(CPACK_ARCHIVE_COMPONENT_INSTALL 1)
set(CPACK_PACKAGING_INSTALL_PREFIX /opt/My-1.0)
The result is that I cannot create a .tar.gz package.
Steps to Reproduce:
Use this CMakeLists.txt file:
file(WRITE file.txt.in hi)
configure_file(file.txt.in ${CMAKE_CURRENT_BINARY_DIR}/file-runtime.txt)
configure_file(file.txt.in ${CMAKE_CURRENT_BINARY_DIR}/file-devel.txt)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/file-runtime.txt
DESTINATION bin COMPONENT Runtime)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/file-devel.txt
DESTINATION lib COMPONENT Development)
set(CPACK_COMPONENTS_ALL Development)
set(CPACK_ARCHIVE_COMPONENT_INSTALL 1)
set(CPACK_PACKAGING_INSTALL_PREFIX /opt/My-1.0)
include(CPack)
Additional Information:
With -V, cpack gives:
CPack: Create package
CPack Verbose: Package files to:
_CPack_Packages/Linux/TGZ/Project-0.1.1-Linux.tar.gz
CPack Verbose: Component Development does not belong to any group, package it
separately.
CPack Verbose:- packaging component: Development
CPack Error: ERROR while packaging files: archive_read_disk_entry_from_file:
Can't lstat lib/file-devel.txt
It also doesn't make sense that I get the message Component Development does
not belong to any group, package it separately, when I'm already packaging it
separatly by setting CPACK_COMPONENTS_ALL.
==
Issue History
Date ModifiedUsername FieldChange
==
2014-01-01 14:19 Clinton StimpsonNew 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] (no subject)
Hello CMakers,
I’m seeing behavior with find_path that seems to be inconsistent with the
cmake documentation. According to the documentation (as I understand it),
when NO_DEFAULT_PATH is set, the CMAKE_FIND_ROOT_PATH should have no impact
on where find_path looks. However it seems to be having a big impact when
the CMAKE_TOOLCHAIN_FILE is used.
You’ll see between Experiment 2 and Experiment 3 below, where the only
difference is setting
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
and this means the difference between success and failure of find_path,
even though CMAKE_FIND_ROOT_PATH should have no impact if NO_DEFAULT_PATH
is used.
Furthermore CMAKE_FIND_ROOT_PATH_MODE_INCLUDE seems to have this impact
only when cross-compiling, not when
Thoughts? Is this behavior seem odd to anyone else?
Matt
Experiment 1:
CMakeLists.txt:
cmake_minimum_required(VERSION 2.8)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS
/home/vagrant/Projects/cmake-test/zlib-1.2.8 NO_DEFAULT_PATH)
message(Found: ${ZLIB_INCLUDE_DIR}”)
Output from cmake:
cmake ..
-- The C compiler identification is GNU 4.6.3
-- The CXX compiler identification is GNU 4.6.3
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
Found: /home/vagrant/Projects/cmake-test/zlib-1.2.8
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/vagrant/Projects/another-cmake-test/build
Experiment 2:
CMakeLists.txt: same as above
Toolchain file:
# this one is important
SET(CMAKE_SYSTEM_NAME Linux)
# specify the cross compiler
set(CMAKE_C_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-g++)
# where is the target environment
set(CMAKE_FIND_ROOT_PATH /opt/freescale-2010.09)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
Output from cmake:
-- The C compiler identification is GNU 4.5.1
-- The CXX compiler identification is GNU 4.5.1
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
Found: ZLIB_INCLUDE_DIR-NOTFOUND
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/vagrant/Projects/another-cmake-test/build
Experiment 3:
CMakeLists.txt:
cmake_minimum_required(VERSION 2.8)
find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS
/home/vagrant/Projects/cmake-test/zlib-1.2.8 NO_DEFAULT_PATH)
message(Found: ${ZLIB_INCLUDE_DIR}”)
Toolchain file:
this one is important
SET(CMAKE_SYSTEM_NAME Linux)
# specify the cross compiler
set(CMAKE_C_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-g++)
# where is the target environment
set(CMAKE_FIND_ROOT_PATH /opt/freescale-2010.09)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
Output from cmake:
cmake -DCMAKE_TOOLCHAIN_FILE=../TC-powerpc-e500v2.cmake ..
-- The C compiler identification is GNU 4.5.1
-- The CXX compiler identification is GNU 4.5.1
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
Found: /home/vagrant/Projects/cmake-test/zlib-1.2.8
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/vagrant/Projects/another-cmake-test/build
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support:
[CMake] How to locate clang-format
I would like to add a target to format my code with clang-format. However, clang-format isn't installed as clang-format (at least not on Ubuntu). Instead, it installs itself as clang-format-3.4, clang-format-3.5, etc. Is there a reasonable way to locate the binary with the largest version number = than some minimum version? For example, I'd like to find clang-format-3.5 or later (even if the next version happens to be clang-format-4.0), and then create a symlink in the build tree for other scripts to use. I looked at find_program, but it doesn't appear to deal with this. I'd appreciate any suggestions. Thanks, Michi. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to locate clang-format
On Wednesday, January 1, 2014 at 4:27 PM, Michi Henning wrote:
I would like to add a target to format my code with clang-format. However,
clang-format isn't installed as clang-format (at least not on Ubuntu).
Instead, it installs itself as clang-format-3.4, clang-format-3.5, etc.
Is there a reasonable way to locate the binary with the largest version
number = than some minimum version? For example, I'd like to find
clang-format-3.5 or later (even if the next version happens to be
clang-format-4.0), and then create a symlink in the build tree for other
scripts to use.
I am a CMake newbie (like, just this week), and this is only a partial solution
(I think I could probably flesh it out if we knew what the version string would
look like in all situations), but maybe something like this:
CMakeLists.txt:
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
find_package(ClangFormat)
if(CLANG_FORMAT_FOUND)
message(clang-format executable: ${CLANG_FORMAT_EXECUTABLE})
message(clang-format version: ${CLANG_FORMAT_VERSION})
else()
message(clang-format executable not found)
endif()
FindClangFormat.cmake (in the CMAKE_SOURCE_DIR):
string(REPLACE : ; _PATH $ENV{PATH})
foreach(p ${_PATH})
file(GLOB cand ${p}/clang-format*)
if(cand)
set(CLANG_FORMAT_EXECUTABLE ${cand})
set(CLANG_FORMAT_FOUND ON)
execute_process(COMMAND ${CLANG_FORMAT_EXECUTABLE} -version
OUTPUT_VARIABLE clang_out )
string(REGEX MATCH .*\(version[^\n]*\)\n version ${clang_out})
set(CLANG_FORMAT_VERSION ${CMAKE_MATCH_1})
break()
else()
set(CLANG_FORMAT_FOUND OFF)
endif()
endforeach()
Matt
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] (no subject)
With a bit of thought and source code reading, I sorted this out. Let me know
if you'd like me to post my answer to my own question.
Matt
On Jan 1, 2014, at 11:13 AM, Matt Wilbur wilb...@gmail.com wrote:
Hello CMakers,
I’m seeing behavior with find_path that seems to be inconsistent with the
cmake documentation. According to the documentation (as I understand it),
when NO_DEFAULT_PATH is set, the CMAKE_FIND_ROOT_PATH should have no impact
on where find_path looks. However it seems to be having a big impact when
the CMAKE_TOOLCHAIN_FILE is used.
You’ll see between Experiment 2 and Experiment 3 below, where the only
difference is setting
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
and this means the difference between success and failure of find_path, even
though CMAKE_FIND_ROOT_PATH should have no impact if NO_DEFAULT_PATH is used.
Furthermore CMAKE_FIND_ROOT_PATH_MODE_INCLUDE seems to have this impact only
when cross-compiling, not when
Thoughts? Is this behavior seem odd to anyone else?
Matt
Experiment 1:
CMakeLists.txt:
cmake_minimum_required(VERSION 2.8)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS
/home/vagrant/Projects/cmake-test/zlib-1.2.8 NO_DEFAULT_PATH)
message(Found: ${ZLIB_INCLUDE_DIR}”)
Output from cmake:
cmake ..
-- The C compiler identification is GNU 4.6.3
-- The CXX compiler identification is GNU 4.6.3
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
Found: /home/vagrant/Projects/cmake-test/zlib-1.2.8
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/vagrant/Projects/another-cmake-test/build
Experiment 2:
CMakeLists.txt: same as above
Toolchain file:
# this one is important
SET(CMAKE_SYSTEM_NAME Linux)
# specify the cross compiler
set(CMAKE_C_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-g++)
# where is the target environment
set(CMAKE_FIND_ROOT_PATH /opt/freescale-2010.09)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
Output from cmake:
-- The C compiler identification is GNU 4.5.1
-- The CXX compiler identification is GNU 4.5.1
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
Found: ZLIB_INCLUDE_DIR-NOTFOUND
-- Configuring done
-- Generating done
-- Build files have been written to:
/home/vagrant/Projects/another-cmake-test/build
Experiment 3:
CMakeLists.txt:
cmake_minimum_required(VERSION 2.8)
find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS
/home/vagrant/Projects/cmake-test/zlib-1.2.8 NO_DEFAULT_PATH)
message(Found: ${ZLIB_INCLUDE_DIR}”)
Toolchain file:
this one is important
SET(CMAKE_SYSTEM_NAME Linux)
# specify the cross compiler
set(CMAKE_C_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc)
set(CMAKE_CXX_COMPILER /opt/freescale-2010.09/bin/powerpc-linux-gnu-g++)
# where is the target environment
set(CMAKE_FIND_ROOT_PATH /opt/freescale-2010.09)
# search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# for libraries and headers in the target directories
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
Output from cmake:
cmake -DCMAKE_TOOLCHAIN_FILE=../TC-powerpc-e500v2.cmake ..
-- The C compiler identification is GNU 4.5.1
-- The CXX compiler identification is GNU 4.5.1
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc
-- Check for working C compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++
-- Check for working CXX compiler:
/opt/freescale-2010.09/bin/powerpc-linux-gnu-g++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
Found: /home/vagrant/Projects/cmake-test/zlib-1.2.8
-- Configuring done
-- Generating
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6596-g967591d
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 967591d0f3258fa70d553addae8dfc18832ae787 (commit)
via b98ef8d63b0ebbbf796b1593220905c8da6d23ba (commit)
from e57c1cbbf11fd13a650a9e571543eca7774b9b00 (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=967591d0f3258fa70d553addae8dfc18832ae787
commit 967591d0f3258fa70d553addae8dfc18832ae787
Merge: e57c1cb b98ef8d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jan 1 10:10:13 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 1 10:10:13 2014 -0500
Merge topic 'minor-cleanups' into next
b98ef8d cmTarget: Fix system include annotation propagation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b98ef8d63b0ebbbf796b1593220905c8da6d23ba
commit b98ef8d63b0ebbbf796b1593220905c8da6d23ba
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Jan 1 15:49:05 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Jan 1 16:01:36 2014 +0100
cmTarget: Fix system include annotation propagation.
Direct users of IMPORTED targets treat INTERFACE_INCLUDE_DIRECTORIES
as SYSTEM, after commit a63fcbcb (Always consider includes from IMPORTED
targets to be SYSTEM., 2013-08-29). It was intended that transitive
use of an IMPORTED target would have the same behavior, but that
did not work. The implementation processed only direct dependencies
in cmTarget::FinalizeSystemIncludeDirectories.
Implement transitive evaluation of dependencies by traversing the
link interface of each target in the link implementation.
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx
b/Source/cmGeneratorExpressionDAGChecker.cxx
index 84d7735..c2c4e20 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -192,7 +192,8 @@ bool
cmGeneratorExpressionDAGChecker::EvaluatingSystemIncludeDirectories() const
{
const char *prop = this-Property.c_str();
- return strcmp(prop, INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) == 0;
+ return (strcmp(prop, SYSTEM_INCLUDE_DIRECTORIES) == 0
+ || strcmp(prop, INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) == 0);
}
//
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index fdd4e6d..a7821a3 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -18,9 +18,12 @@
#include cmSourceFile.h
#include cmGeneratorExpression.h
#include cmGeneratorExpressionDAGChecker.h
+#include cmComputeLinkInformation.h
#include queue
+#include assert.h
+
//
cmGeneratorTarget::cmGeneratorTarget(cmTarget* t): Target(t)
{
@@ -59,10 +62,50 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile* sf) const
return 0;
}
+static void handleSystemIncludesDep(cmMakefile *mf, const std::string name,
+ const char *config, cmTarget *headTarget,
+ cmGeneratorExpressionDAGChecker *dagChecker,
+ std::vectorstd::string result)
+{
+ cmTarget* depTgt = mf-FindTargetToUse(name.c_str());
+
+ if (!depTgt)
+{
+return;
+}
+
+ cmListFileBacktrace lfbt;
+
+ if (const char* dirs =
+ depTgt-GetProperty(INTERFACE_SYSTEM_INCLUDE_DIRECTORIES))
+{
+cmGeneratorExpression ge(lfbt);
+cmSystemTools::ExpandListArgument(ge.Parse(dirs)
+ -Evaluate(mf,
+ config, false, headTarget,
+ depTgt, dagChecker), result);
+}
+ if (!depTgt-IsImported())
+{
+return;
+}
+
+ if (const char* dirs =
+depTgt-GetProperty(INTERFACE_INCLUDE_DIRECTORIES))
+{
+cmGeneratorExpression ge(lfbt);
+cmSystemTools::ExpandListArgument(ge.Parse(dirs)
+ -Evaluate(mf,
+ config, false, headTarget,
+ depTgt, dagChecker), result);
+}
+}
+
//
bool cmGeneratorTarget::IsSystemIncludeDirectory(const char *dir,
const char *config) const
{
+ assert(this-GetType() != cmTarget::INTERFACE_LIBRARY);
std::string config_upper;
if(config *config)
{
@@ -75,39 +118,75 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const
char *dir,
if (iter
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6601-g5f8900c
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 5f8900cb38086687051edbd9904dbe21819b5e9a (commit)
via e6b0f452ee1d2cbe26f9977c94470c223c13ab05 (commit)
via 9e9debe505964525c9a8466b8d76ceb24b4ee022 (commit)
via 403632c8ae1718cadc4e2102638bbd03e5d8d1fc (commit)
via 1b7546c460c5390c0032c20b5a70a63b254059c0 (commit)
from 967591d0f3258fa70d553addae8dfc18832ae787 (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=5f8900cb38086687051edbd9904dbe21819b5e9a
commit 5f8900cb38086687051edbd9904dbe21819b5e9a
Merge: 967591d e6b0f45
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Wed Jan 1 12:43:16 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 1 12:43:16 2014 -0500
Merge topic 'EclipseUse64bitMachOParser' into next
e6b0f45 Eclipse: use MachO64 parser starting with Helios (#14380)
9e9debe CMake Nightly Date Stamp
403632c CMake Nightly Date Stamp
1b7546c CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6b0f452ee1d2cbe26f9977c94470c223c13ab05
commit e6b0f452ee1d2cbe26f9977c94470c223c13ab05
Author: Alex Neundorf neund...@kde.org
AuthorDate: Wed Jan 1 17:52:57 2014 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Wed Jan 1 17:52:57 2014 +0100
Eclipse: use MachO64 parser starting with Helios (#14380)
With this patch, cmake now puts the MachO64 bit
binary file parser into the config file if the detected
Eclipse is at least Helios (7.0), otherwise with the old
parser executables will not be recognized by Eclipse.
Alex
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx
b/Source/cmExtraEclipseCDT4Generator.cxx
index 755b445..c93187e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -40,6 +40,7 @@ cmExtraEclipseCDT4Generator
this-SupportsVirtualFolders = true;
this-GenerateLinkedResources = true;
this-SupportsGmakeErrorParser = true;
+ this-SupportsMachO64Parser = true;
}
//
@@ -93,6 +94,7 @@ void cmExtraEclipseCDT4Generator::Generate()
if (version 3006) // 3.6 is Helios
{
this-SupportsVirtualFolders = false;
+this-SupportsMachO64Parser = false;
}
if (version 3007) // 3.7 is Indigo
{
@@ -754,7 +756,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
}
else if (systemName == Darwin)
{
- fout extension id=\org.eclipse.cdt.core.MachO\
+ fout extension id=\
+ (this-SupportsMachO64Parser ? org.eclipse.cdt.core.MachO64
+: org.eclipse.cdt.core.MachO) \
point=\org.eclipse.cdt.core.BinaryParser\\n
attribute key=\c++filt\ value=\c++filt\/\n
/extension\n
diff --git a/Source/cmExtraEclipseCDT4Generator.h
b/Source/cmExtraEclipseCDT4Generator.h
index 9c89f85..d88b247 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -115,6 +115,7 @@ private:
bool GenerateLinkedResources;
bool SupportsVirtualFolders;
bool SupportsGmakeErrorParser;
+ bool SupportsMachO64Parser;
};
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmExtraEclipseCDT4Generator.cxx |6 +-
Source/cmExtraEclipseCDT4Generator.h |1 +
3 files changed, 7 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.12.1-1020-gc0798b5
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 c0798b50d01aa33386bbd54ce1ed53e7090d4f85 (commit) from 9e9debe505964525c9a8466b8d76ceb24b4ee022 (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=c0798b50d01aa33386bbd54ce1ed53e7090d4f85 commit c0798b50d01aa33386bbd54ce1ed53e7090d4f85 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Jan 2 00:01:08 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Jan 2 00:01:08 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 85e1019..5cb27c8 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 12) -set(CMake_VERSION_TWEAK 20140101) +set(CMake_VERSION_TWEAK 20140102) #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
