Re: [cmake-developers] FindPackageCheckArchLinuxSymlinks branch on stage
Alexander Neundorf wrote:
It looks like you merged your patch to next, but didn't account for this
part. I recommend doing something similar to what you did for the macro
to manipulate the _IMPORT_PREFIX in export files. Wait for my
fix-relocatable- include-dirs topic to be merged first though.
I thought that's your part, since you're working on the target stuff a lot
:-)
That doesn't mean anything I'm afraid. The patches I wrote had nothing to do
with this, and I don't have the energy for this task.
I had another look at your patch and noticed that $ENV{DESTDIR} is not
handled. Should it be?
Thanks,
Steve.
--
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
Re: [cmake-developers] FindPackageCheckArchLinuxSymlinks branch on stage
On 02/01/2013 09:37 AM, Stephen Kelly wrote:
I had another look at your patch and noticed that $ENV{DESTDIR} is not
handled. Should it be?
No, the decision is about where the files expect themselves to be when
they are loaded in use. DESTDIR is only about packaging.
-Brad
--
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
Re: [cmake-developers] Setting includes, defines and other usage requirements with one command
On 01/31/2013 11:35 AM, Stephen Kelly wrote: It should be clear that the upstream is responsible for adding the example code to set the package_NO_INTERFACES variable in their package config file when it exposes the new interfaces. Also package_INTERFACES is to be set by the downstream and used by that code in the upstream. Ok. Hopefully that's more clear now. Better, but I decided to take my own crack at the wording and added a commit to your topic for it. Meanwhile, I've noticed the test run times on some dashboard machines have doubled since two weeks ago. Can you please run some timing tests comparing current 'next' to 2.8.10.2 for some existing projects? Thanks, -Brad -- 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
Re: [CMake] So Long
Thought I'd ping the CMake mailing lists one last time before I have to give up david.c...@kitware.com... ;-) Thanks for all your hard work on this.. 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
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1846-g10ea2a5
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 10ea2a5f3ae0e32da81078782174f9393611213c (commit)
via 588d705cb1ec1d37f10711eb9c0a9e2398805f47 (commit)
via 23ae48412093e4acbd5270536aace226d5869679 (commit)
via 163812468054601c95ac894703a6299d3b324e22 (commit)
via fc2638f0b43f88683b6d8251be92119f4a3b3f1b (commit)
from a86384eca61b8b9a6598a2d956894e196acbe767 (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=10ea2a5f3ae0e32da81078782174f9393611213c
commit 10ea2a5f3ae0e32da81078782174f9393611213c
Merge: a86384e 588d705
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 1 09:31:09 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 1 09:31:09 2013 -0500
Merge topic 'update-kwsys' into next
588d705 Merge branch 'upstream-kwsys' into update-kwsys
23ae484 KWSys 2013-01-31 (5b0d1bd9)
1638124 CMake Nightly Date Stamp
fc2638f CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=588d705cb1ec1d37f10711eb9c0a9e2398805f47
commit 588d705cb1ec1d37f10711eb9c0a9e2398805f47
Merge: 1638124 23ae484
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 1 09:28:50 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 1 09:28:50 2013 -0500
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23ae48412093e4acbd5270536aace226d5869679
commit 23ae48412093e4acbd5270536aace226d5869679
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Thu Jan 31 08:21:49 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 1 09:27:46 2013 -0500
KWSys 2013-01-31 (5b0d1bd9)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 5b0d1bd9 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 6fa1c99f..5b0d1bd9
Alan Hourihane (2):
e81e2b72 DynamicLoader: Implement on Atari FreeMINT
5c4dcb2b ProcessUNIX: No select on Atari FreeMINT
Sean McBride (2):
bff2ea07 Glob: Fix clang -Wdocumentation warning
5b0d1bd9 Fix clang -Weverything warnings
Change-Id: I8b342bea8bc9c7b92a856ddc948e1b56f5e74b98
diff --git a/DynamicLoader.cxx b/DynamicLoader.cxx
index c4ee095..fd83752 100644
--- a/DynamicLoader.cxx
+++ b/DynamicLoader.cxx
@@ -428,6 +428,58 @@ const char* DynamicLoader::LastError()
} // namespace KWSYS_NAMESPACE
#endif
+#ifdef __MINT__
+#define DYNAMICLOADER_DEFINED 1
+#define _GNU_SOURCE /* for program_invocation_name */
+#include string.h
+#include malloc.h
+#include errno.h
+#include dld.h
+
+namespace KWSYS_NAMESPACE
+{
+
+//
+DynamicLoader::LibraryHandle DynamicLoader::OpenLibrary(const char* libname )
+{
+ char *name = (char *)calloc(1, strlen(libname) + 1);
+ dld_init(program_invocation_name);
+ strncpy(name, libname, strlen(libname));
+ dld_link(libname);
+ return (void *)name;
+}
+
+//
+int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
+{
+ dld_unlink_by_file((char *)lib, 0);
+ free(lib);
+ return 0;
+}
+
+//
+DynamicLoader::SymbolPointer DynamicLoader::GetSymbolAddress(
+ DynamicLoader::LibraryHandle lib, const char* sym)
+{
+ // Hack to cast pointer-to-data to pointer-to-function.
+ union
+ {
+void* pvoid;
+DynamicLoader::SymbolPointer psym;
+ } result;
+ result.pvoid = dld_get_symbol(sym);
+ return result.psym;
+}
+
+//
+const char* DynamicLoader::LastError()
+{
+ return dld_strerror(dld_errno);
+}
+
+} // namespace KWSYS_NAMESPACE
+#endif
+
// ---
// 6. Implementation for default UNIX machines.
// if nothing has been defined then use this
diff --git a/Glob.cxx b/Glob.cxx
index 513eb64..46a7e4f 100644
--- a/Glob.cxx
+++ b/Glob.cxx
@@ -399,7 +399,7 @@ bool Glob::FindFiles(const kwsys_stl::string inexpr)
if ( last_slash 0 )
{
//kwsys_ios::cout I can skip: fexpr.substr(0, last_slash)
-// kwsys_ios::endl;
+// kwsys_ios::endl;
skip = last_slash;
}
if ( skip == 0 )
diff --git a/IOStream.cxx b/IOStream.cxx
index 57b696e..a31f8c8 100644
--- a/IOStream.cxx
+++ b/IOStream.cxx
@@ -272,6 +272,7 @@ namespace KWSYS_NAMESPACE
// Create one public
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1848-g890d458
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 890d45859885661b59d211b1acf0058c5b44c76d (commit)
via 179f49560286e2e322b9b0cf5d0a277b7634540f (commit)
from 10ea2a5f3ae0e32da81078782174f9393611213c (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=890d45859885661b59d211b1acf0058c5b44c76d
commit 890d45859885661b59d211b1acf0058c5b44c76d
Merge: 10ea2a5 179f495
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 1 10:32:00 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Feb 1 10:32:00 2013 -0500
Merge topic 'tll-includes-defines' into next
179f495 find_package: Reword package_NO_INTERFACES documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=179f49560286e2e322b9b0cf5d0a277b7634540f
commit 179f49560286e2e322b9b0cf5d0a277b7634540f
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Feb 1 10:30:57 2013 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Feb 1 10:30:57 2013 -0500
find_package: Reword package_NO_INTERFACES documentation
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index e9b6ab6..6e78bd7 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -376,26 +376,25 @@ void cmFindPackageCommand::GenerateDocumentation()
The package configuration file may set package_FOUND to false
to tell find_package that component requirements are not satisfied.
\n
-Targets exported by the install() command may have additional INTERFACE
-properties set for include directories, compile definitions etc. As
-these may create a backward compatibility concern for consumers of
-existing projects, it is possible to set the package_NO_INTERFACES
-variable to disable populating those interfaces. It is possible to
-emulate a version-based policy for whether the interfaces should be
-enabled in the config file before including the imported targets file.
-This allows consumers to decide when to enable the new interfaces when
-upgrading. The upstream project is responsible for adding code similar
-to this in the version which generates the INTERFACE content:\n
- if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION VERSION_LESS 2.3\n
- AND NOT ${CMAKE_FIND_PACKAGE_NAME}_INTERFACES)\n
-set(${CMAKE_FIND_PACKAGE_NAME}_NO_INTERFACES 1)\n
+A package configuration file may include() a packageTargets.cmake
+file, created by install(EXPORT) in the upstream source, to import
+targets into the downstream consumer.
+When a new version of the upstream adds INTERFACE properties not
+present in a previous version it can change behavior for existing
+downstreams.
+In order to remain source compatible the upstream package configuration
+file may set package_NO_INTERFACES to disable INTERFACE properties.
+For example, code of the form:\n
+ if(package_FIND_VERSION VERSION_LESS new-version\n
+ AND NOT package_INTERFACES)\n
+set(package_NO_INTERFACES 1)\n
endif()\n
include(\${CMAKE_CURRENT_LIST_DIR}/packageTargets.cmake\)\n
-\n
-Downstream users may then choose to use the new interfaces by finding
-the newer version of upstream. They can also choose to not use the new
-interfaces by setting package_INTERFACES to false before finding the
-package.\n
+tells packageTargets.cmake not to provide the INTERFACE properties
+unless the downstream requests at least new-version or sets
+package_INTERFACES to explicitly request them.
+This allows consumers to decide when to enable the new interfaces when
+upgrading.
\n
See the cmake_policy() command documentation for discussion of the
NO_POLICY_SCOPE option.
---
Summary of changes:
Source/cmFindPackageCommand.cxx | 35 +--
1 files changed, 17 insertions(+), 18 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-557-g425c567
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 425c56788d30d85429f7d068c1d340dee99456a6 (commit) from 163812468054601c95ac894703a6299d3b324e22 (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=425c56788d30d85429f7d068c1d340dee99456a6 commit 425c56788d30d85429f7d068c1d340dee99456a6 Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Feb 2 00:01:22 2013 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Feb 2 00:01:22 2013 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 188a3db..c9049ca 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 20130201) +set(CMake_VERSION_TWEAK 20130202) #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
