[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-316-g8bfa6a0

[Kitware Robot]

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  8bfa6a00ea7181b49ca4f604c6b8eeab277f0e7e (commit)
  from  cdb6d7df970fcaaf6cda1bef9955351222e1bcde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bfa6a00ea7181b49ca4f604c6b8eeab277f0e7e
commit 8bfa6a00ea7181b49ca4f604c6b8eeab277f0e7e
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Tue Feb 28 00:01:08 2017 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Feb 28 00:01:08 2017 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 13bd07b..28cbbe4 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 8)
-set(CMake_VERSION_PATCH 20170227)
+set(CMake_VERSION_PATCH 20170228)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [CMake] RPATH cross-compile issue with CHECK_*_EXISTS

[Ray Donnelly]

On Mon, Feb 27, 2017 at 9:39 PM, Brad King  wrote:
> On 02/27/2017 03:54 PM, Ray Donnelly wrote:
>> This is why my PR asks the linker that the compiler will use for the
>> actual list of implicit link dirs. I'm sorry I've not had time to
>> write up a clear explanation yet.
>
> IIUC your case is the opposite of that under discussion in the rest
> of this thread.  You want to include a rpath that is not currently
> included.  Jörg wants to exclude a rpath that is currently being
> incorrectly included.  The detection you're proposing would not
> discover the lib32 entry that is causing Jörg's problem.
>

Not really, my PR is about ensuring that CMake's idea of implicit dirs
isn't mismatched with the linker's actual implicit dirs by actually
asking the linker. AFAICT, it fixes Jörg's problem too. I say that
because as stated:

> CMake passes the host rpath to the linker

CMake does this because it isn't *asking* the linker, it's making
assumptions instead (and adding some predefined values like
`/usr/lib32`). If we just ask the linker instead then everything
should work just fine (I am ignore linkers that cannot tell us here
like Apple's ld64. I'm not sure how to tackle that one yet).

> As I requested in your MR [1] it will be more appropriate to discuss
> your rpath-inclusion use case in a separate issue.
>
> Thanks,
> -Brad
>
> [1] https://gitlab.kitware.com/cmake/cmake/merge_requests/207#note_189880
>
-- 

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://public.kitware.com/mailman/listinfo/cmake

[CMake] ExternalProject_add not buing launched

[Michele Portolan]

Hello,

I am trying to set my Cmake project to build the "xmlrpc-c" library, 
which is built using autotools. I was somewhat able to set it up 
following this example: 
http://mirkokiefer.com/blog/2013/03/cmake-by-example/


My resulting CMakeList is the following:

ExternalProject_Add( project_xmlprc
  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc-c"
  PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc-c"
  CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/xmlrpc-c/configure 
--prefix=${CMAKE_CURRENT_BINARY_DIR}/xmlrpc-c/

  BUILD_COMMAND make
  INSTALL_COMMAND make install
  BUILD_IN_SOURCE 1
)

ExternalProject_Get_Property(project_xmlprc install_dir)


add_library(xmlprc SHARED IMPORTED)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc++.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_packetsocket.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_client.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_client++.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_server++.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_server_abyss++.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_util.so)
set_property(TARGET xmlprc PROPERTY IMPORTED_LOCATION 
${install_dir}/lib/libxmlrpc_util++.so)

add_dependencies(xmlprc project_xmlprc)

It sort of works, meaning I can see the library being built in 
${CMAKE_CURRENT_BINARY_DIR}/xmlrpc-c/.


My problem is that the build is launched only the first time! If I 
delete the ${CMAKE_CURRENT_BINARY_DIR} and re-launch cmake, the 
ExternalProjet is not rebuilt. To have a rebuild, I have to do this 
strange workaround:


  - modify "BUILD_IN_SOURCE" to 0

 - run cmake+make. I get an error as xmlrpc only support in-source build

 - put "BUILD_IN_SOURCE"back to 1

 - run cmake+make. This time it works.


Looks like it is some issue in the source tree remaining dirty, but even 
running a "make distclean" does not change anything, I need to do the 
workaround.


Any idea of where the problem lies?

Thanks,


Michele



--

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://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] RPATH cross-compile issue with CHECK_*_EXISTS

[Brad King]

On 02/27/2017 03:54 PM, Ray Donnelly wrote:
> This is why my PR asks the linker that the compiler will use for the
> actual list of implicit link dirs. I'm sorry I've not had time to
> write up a clear explanation yet.

IIUC your case is the opposite of that under discussion in the rest
of this thread.  You want to include a rpath that is not currently
included.  Jörg wants to exclude a rpath that is currently being
incorrectly included.  The detection you're proposing would not
discover the lib32 entry that is causing Jörg's problem.

As I requested in your MR [1] it will be more appropriate to discuss
your rpath-inclusion use case in a separate issue.

Thanks,
-Brad

[1] https://gitlab.kitware.com/cmake/cmake/merge_requests/207#note_189880

-- 

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://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] RPATH cross-compile issue with CHECK_*_EXISTS

[Brad King]

On 02/27/2017 03:50 PM, Jörg Krause wrote:
> The problem is...

Thanks.  I've opened an issue for this here:

 https://gitlab.kitware.com/cmake/cmake/issues/16682

>> These are set on by default in `Modules/Platform/UnixPaths.cmake` but
>> disabled on Debian by `Modules/Platform/Linux.cmake` except when
>> cross compiling.  If a toolchain file specifies CMAKE_SYSTEM_NAME
>> such that a custom `Platform/MySystem.cmake` file is loaded then
>> the latter can set them as needed for the target platform.
> 
> Thanks for the hint. We are discussing this setting as a workaround.

It sounds like this target platform does not want the lib32/lib64
suffixes to be searched so this would be an appropriate setting
for the projects to use regardless of what is done about this in
upstream CMake.  That will also fix it for using CMake 3.7.

-Brad
-- 

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://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] RPATH cross-compile issue with CHECK_*_EXISTS

[Ray Donnelly]

On Mon, Feb 27, 2017 at 8:50 PM, Jörg Krause
 wrote:
> Hi Brad,
>
> On Mon, 2017-02-27 at 11:43 -0500, Brad King wrote:
>> On 02/07/2017 04:40 AM, Ray Donnelly wrote:
>> > > > I have a PR that asks the linker (via the compiler) what its
>> > > > implicit
>> > > > search directories are instead.
>> > > >
>> > > > It is the right way to do it IMHO, but I need to find time to
>> > > > finish
>> > > > it unfortunately.
>> > >
>> > > Do you have a link to the PR?
>> >
>> > The PR Is closed pending me writing a test-case, but I just now
>> > updated to the my latest version and rebased on top of master:
>>
>> The MR was:
>>
>>  https://gitlab.kitware.com/cmake/cmake/merge_requests/207
>>
>> See discussion there for why it has not yet been accepted.  Basically
>> I'd like to see a clear explanation of the use case.  The case
>> described
>> in the MR looks to me like the custom compiler should be configured
>> to
>> always pass the needed rpath flags to the linker.
>>
>> On 02/06/2017 06:16 PM, Jörg Krause wrote:
>> > I did a git bisect. The behaviour was introduced in commit
>> > 896ad251de49f167f4ce3cbbcf9a6cce85a16681 [1].
>>
>> Thanks for the bisect.  I don't think there is anything wrong with
>> that
>> change on its own.  It merely exposed some existing behavior in a new
>> case.
>
> The problem is, that we end up with a host rpath when cross-compiling
> which breaks compilations for a number of CMake packages we build on
> Buildroot.

This is why my PR asks the linker that the compiler will use for the
actual list of implicit link dirs. I'm sorry I've not had time to
write up a clear explanation yet.

>
> Buildroot uses /sysroot/usr/lib as target library path and
> /sysroot/usr/lib32 is a symlink to that path. Nothing wrong here.
>
> The addition of FIND_LIBRARY_USE_LIB32_PATHS changes the behavior of
> `find_library()`. Before the commit `/sysroot/usr/lib` was
> found as library path, but now it's `/sysroot/usr/lib32`.
>
> When determining the runtime search path, CMake compares the paths
> found by `find_library()` with a list of implicit runtime pathes. This
> list contains `/sysroot/usr/lib` but not `/sysroot/usr/lib32`.
>
> If the library path found by `find_library()` matches a search path
> from the list of implicit runtime pathes it is dropped, otherwise it is
> added to rpath after removing the `/sysroot` path.
>
> So, as the implicit runtime search paths does *not* contain
> `/sysroot/usr/lib32`, find_library() ends up with a rpath set to
> `/usr/lib32`.
>
>
>
> One example of how cross-compilation is broken is the example I already
> quoted:
>
> """
> $SYSROOT/usr/bin/i586-linux-gcc --sysroot=$SYSROOT/usr/i586-buildroot-
> linux-musl/sysroot CheckSymbolExists.c.o -o cmTC_cb8f6 -Wl,-
> rpath,/usr/lib32 -rdynamic $SYSROOT/usr/i586-buildroot-linux-
> musl/sysroot/usr/lib32/libmbedtls.so
> """
>
> If libmbedtls is linked with libz, the linker tries to link the target
> libmbedtls with host libz, which fails:
>
> """
> $SYSROOT/usr/i586-buildroot-linux-musl/bin/ld: warning:
> libc.so.6, needed by /usr/lib32/libz.so.1, not found (try using -rpath
> or -rpath-link)
> /usr/lib32/libz.so.1: undefined reference to `strcpy@GLIBC_2.0'
> /usr/lib32/libz.so.1: undefined reference to `free@GLIBC_2.0'
> /usr/lib32/libz.so.1: undefined reference to `fseeko64@GLIBC_2.1
> """
>
> Note, that Buildroot does not use a /sysroot/usr/lib64 symbolic link.
> Therefore, this behavior was not exposed before the commit.
>
> For me, it looks like there is a problem how the rpath is created when
> cross-compiling. Maybe the logic should check, if /sysroot/usr/lib32 is
> a symlink to an implicit runtime search path?
>
> However, I am not very familiar with CMake and the insights I described
> where gathered by some hours of debugging the CMake code. Maybe I
> missed something?
>
>> > My suggestion is to set FIND_LIBRARY_USE_LIB32_PATHS and
>> > FIND_LIBRARY_USE_LIB64_PATHS to FALSE when cross-compiling on
>> > Linux.
>>
>> These are set on by default in `Modules/Platform/UnixPaths.cmake` but
>> disabled on Debian by `Modules/Platform/Linux.cmake` except when
>> cross compiling.  If a toolchain file specifies CMAKE_SYSTEM_NAME
>> such that a custom `Platform/MySystem.cmake` file is loaded then
>> the latter can set them as needed for the target platform.
>
> Thanks for the hint. We are discussing this setting as a workaround.
>
> Best regards,
> Jörg Krause
-- 

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 

Re: [CMake] RPATH cross-compile issue with CHECK_*_EXISTS

[Jörg Krause]

Hi Brad,

On Mon, 2017-02-27 at 11:43 -0500, Brad King wrote:
> On 02/07/2017 04:40 AM, Ray Donnelly wrote:
> > > > I have a PR that asks the linker (via the compiler) what its
> > > > implicit
> > > > search directories are instead.
> > > > 
> > > > It is the right way to do it IMHO, but I need to find time to
> > > > finish
> > > > it unfortunately.
> > > 
> > > Do you have a link to the PR?
> > 
> > The PR Is closed pending me writing a test-case, but I just now
> > updated to the my latest version and rebased on top of master:
> 
> The MR was:
> 
>  https://gitlab.kitware.com/cmake/cmake/merge_requests/207
> 
> See discussion there for why it has not yet been accepted.  Basically
> I'd like to see a clear explanation of the use case.  The case
> described
> in the MR looks to me like the custom compiler should be configured
> to
> always pass the needed rpath flags to the linker.
> 
> On 02/06/2017 06:16 PM, Jörg Krause wrote:
> > I did a git bisect. The behaviour was introduced in commit
> > 896ad251de49f167f4ce3cbbcf9a6cce85a16681 [1].
> 
> Thanks for the bisect.  I don't think there is anything wrong with
> that
> change on its own.  It merely exposed some existing behavior in a new
> case.

The problem is, that we end up with a host rpath when cross-compiling
which breaks compilations for a number of CMake packages we build on
Buildroot.

Buildroot uses /sysroot/usr/lib as target library path and
/sysroot/usr/lib32 is a symlink to that path. Nothing wrong here.

The addition of FIND_LIBRARY_USE_LIB32_PATHS changes the behavior of
`find_library()`. Before the commit `/sysroot/usr/lib` was
found as library path, but now it's `/sysroot/usr/lib32`.

When determining the runtime search path, CMake compares the paths
found by `find_library()` with a list of implicit runtime pathes. This
list contains `/sysroot/usr/lib` but not `/sysroot/usr/lib32`.

If the library path found by `find_library()` matches a search path
from the list of implicit runtime pathes it is dropped, otherwise it is
added to rpath after removing the `/sysroot` path.

So, as the implicit runtime search paths does *not* contain
`/sysroot/usr/lib32`, find_library() ends up with a rpath set to
`/usr/lib32`.



One example of how cross-compilation is broken is the example I already
quoted:

"""
$SYSROOT/usr/bin/i586-linux-gcc --sysroot=$SYSROOT/usr/i586-buildroot-
linux-musl/sysroot CheckSymbolExists.c.o -o cmTC_cb8f6 -Wl,-
rpath,/usr/lib32 -rdynamic $SYSROOT/usr/i586-buildroot-linux-
musl/sysroot/usr/lib32/libmbedtls.so
"""

If libmbedtls is linked with libz, the linker tries to link the target
libmbedtls with host libz, which fails:

"""
$SYSROOT/usr/i586-buildroot-linux-musl/bin/ld: warning: 
libc.so.6, needed by /usr/lib32/libz.so.1, not found (try using -rpath 
or -rpath-link) 
/usr/lib32/libz.so.1: undefined reference to `strcpy@GLIBC_2.0' 
/usr/lib32/libz.so.1: undefined reference to `free@GLIBC_2.0' 
/usr/lib32/libz.so.1: undefined reference to `fseeko64@GLIBC_2.1 
"""

Note, that Buildroot does not use a /sysroot/usr/lib64 symbolic link.
Therefore, this behavior was not exposed before the commit.

For me, it looks like there is a problem how the rpath is created when
cross-compiling. Maybe the logic should check, if /sysroot/usr/lib32 is
a symlink to an implicit runtime search path?

However, I am not very familiar with CMake and the insights I described
where gathered by some hours of debugging the CMake code. Maybe I
missed something?

> > My suggestion is to set FIND_LIBRARY_USE_LIB32_PATHS and
> > FIND_LIBRARY_USE_LIB64_PATHS to FALSE when cross-compiling on
> > Linux.
> 
> These are set on by default in `Modules/Platform/UnixPaths.cmake` but
> disabled on Debian by `Modules/Platform/Linux.cmake` except when
> cross compiling.  If a toolchain file specifies CMAKE_SYSTEM_NAME
> such that a custom `Platform/MySystem.cmake` file is loaded then
> the latter can set them as needed for the target platform.

Thanks for the hint. We are discussing this setting as a workaround.

Best regards,
Jörg Krause
-- 

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://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-612-gfd27403

[Brad King]

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  fd27403b79c6bb2f8e2568c456cf2fb615944a75 (commit)
   via  f77420cfc934303ffc3d65e798b64e1631eb5d98 (commit)
   via  ae6607af470e1f3faa287310dc80f1fcd6d18ab8 (commit)
  from  a7450168373f48228c3eb837178867f82fcbee2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd27403b79c6bb2f8e2568c456cf2fb615944a75
commit fd27403b79c6bb2f8e2568c456cf2fb615944a75
Merge: a745016 f77420c
Author: Brad King 
AuthorDate: Mon Feb 27 13:49:27 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 13:49:27 2017 -0500

Merge topic 'update-kwiml' into next

f77420cf Merge branch 'upstream-KWIML' into update-kwiml
ae6607af KWIML 2017-02-27 (aa3a7733)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f77420cfc934303ffc3d65e798b64e1631eb5d98
commit f77420cfc934303ffc3d65e798b64e1631eb5d98
Merge: cdb6d7d ae6607a
Author: Brad King 
AuthorDate: Mon Feb 27 13:49:07 2017 -0500
Commit: Brad King 
CommitDate: Mon Feb 27 13:49:07 2017 -0500

Merge branch 'upstream-KWIML' into update-kwiml

* upstream-KWIML:
  KWIML 2017-02-27 (aa3a7733)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae6607af470e1f3faa287310dc80f1fcd6d18ab8
commit ae6607af470e1f3faa287310dc80f1fcd6d18ab8
Author: KWIML Upstream 
AuthorDate: Mon Feb 27 13:43:26 2017 -0500
Commit: Brad King 
CommitDate: Mon Feb 27 13:49:07 2017 -0500

KWIML 2017-02-27 (aa3a7733)

Code extracted from:

https://gitlab.kitware.com/utils/kwiml.git

at commit aa3a7733039afb11047fb7d4d71fb26e1775c106 (master).

Upstream Shortlog
-

Orion Poplawski (1):
  aa3a7733 test: Add -Wno-format-security to tolerate 
-Werror=format-security

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4f6f37b..1bf93bb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 # Suppress printf/scanf format warnings; we test if the sizes match.
 foreach(lang C CXX)
   if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
-set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format")
+set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format 
-Wno-format-security")
   endif()
 endforeach()
 

---

Summary of changes:
 Utilities/KWIML/test/CMakeLists.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-604-gda58882

[Brad King]

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  da588825475697068e2f3babc092c2cc4f09a31b (commit)
   via  10b2e0e479b1015c905aef19439c10d7546a0232 (commit)
  from  a04f037c1c2286856e26f7190fdf7a816ac37cc6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da588825475697068e2f3babc092c2cc4f09a31b
commit da588825475697068e2f3babc092c2cc4f09a31b
Merge: a04f037 10b2e0e
Author: Brad King 
AuthorDate: Mon Feb 27 13:12:51 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 13:12:51 2017 -0500

Merge topic 'cpack_nsis_sign_uninstaller' into next

10b2e0e4 CPack/NSIS: Sign the uninstaller


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10b2e0e479b1015c905aef19439c10d7546a0232
commit 10b2e0e479b1015c905aef19439c10d7546a0232
Author: Roman Wüger 
AuthorDate: Mon Feb 27 06:47:44 2017 +0100
Commit: Roman Wüger 
CommitDate: Mon Feb 27 06:47:44 2017 +0100

CPack/NSIS: Sign the uninstaller

diff --git a/Help/release/dev/cpack-sign-uninstaller.rst 
b/Help/release/dev/cpack-sign-uninstaller.rst
new file mode 100644
index 000..ff2b402
--- /dev/null
+++ b/Help/release/dev/cpack-sign-uninstaller.rst
@@ -0,0 +1,5 @@
+cpack-sign_uninstaller
+--
+
+* The :module:`CPackNSIS` module learned to sign the uninstaller
+  when using :variable:`CPACK_NSIS_SIGN_UNINSTALLER` variable.
diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake
index 18d1871..37fedf3 100644
--- a/Modules/CPackNSIS.cmake
+++ b/Modules/CPackNSIS.cmake
@@ -133,6 +133,10 @@
 #   "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html"
 #   "CMake Help" "https://cmake.org; "CMake Web Site")
 #
+# .. variable:: CPACK_NSIS_SIGN_UNINSTALLER
+#
+#  Specify a command to use for signing the uninstaller.  The command will
+#  be invoked a path to the uninstaller as its only argument.
 
 #FIXME we should put NSIS specific code here
 #FIXME but I'm not doing it because I'm not able to test it...
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 9001888..a8903f6 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -29,6 +29,33 @@
 
 ;
 ;General
+!ifdef INNER
+  OutFile "$%TEMP%\tempinstaller.exe"
+  SetCompress off   ; for speed
+!else
+  ; Call makensis again, defining INNER.  This writes an installer for us 
which, when
+  ; it is invoked, will just write the uninstaller to some location, and then 
exit.
+  ; Be sure to substitute the name of this script here.
+
+  !system "$\"${NSISDIR}\makensis$\" /DINNER 
@CPACK_TEMPORARY_DIRECTORY@/../project.nsi" = 0
+
+  ; So now run that installer we just created as %TEMP%\tempinstaller.exe.  
Since it
+  ; calls quit the return value isn't zero.
+
+  !system "$%TEMP%\tempinstaller.exe" = 2
+
+  ; That will have written an uninstaller binary for us.  Now we sign it with 
your
+  ; favourite code signing tool.
+
+  !tempfile INCEXIST
+  !system 'if exist "@CPACK_NSIS_SIGN_UNINSTALLER@" echo !define 
HAVE_SIGN_UNINST > "${INCEXIST}"'
+  !include "${INCEXIST}"
+  !delfile "${INCEXIST}"
+  !ifdef HAVE_SIGN_UNINST
+  !system '"@CPACK_NSIS_SIGN_UNINSTALLER@" $%TEMP%\Uninstall.exe' = 0
+  !endif
+
+  ; Good.  Now we can carry on writing the real installer.
 
   ;Name and file
   Name "@CPACK_NSIS_PACKAGE_NAME@"
@@ -36,6 +63,7 @@
 
   ;Set compression
   SetCompressor @CPACK_NSIS_COMPRESSOR@
+!endif
 
   ;Require administrator access
   RequestExecutionLevel admin
@@ -559,8 +587,10 @@ FunctionEnd
   !insertmacro MUI_PAGE_INSTFILES
   !insertmacro MUI_PAGE_FINISH
 
+!ifdef INNER
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
+!endif
 
 ;
 ;Languages
@@ -642,7 +672,10 @@ Section "-Core installation"
   WriteRegStr SHCTX 
"Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" 
$INSTDIR
 
   ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
+!ifndef INNER
+  ; this packages the signed uninstaller
+  File $%TEMP%\Uninstall.exe
+!endif
   Push "DisplayName"
   Push "@CPACK_NSIS_DISPLAY_NAME@"
   Call ConditionalAddToRegisty
@@ -801,6 +834,7 @@ FunctionEnd
 ;
 ;Uninstaller Section
 
+!ifdef INNER
 Section "Uninstall"
   ReadRegStr $START_MENU SHCTX \

"Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 "StartMenu"
@@ -886,6 +920,7 @@ Section "Uninstall"
 Call un.RemoveFromPath
   doNotRemoveFromPath:
 

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-607-g253db69

[Brad King]

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  253db6906ca42d7e02dadbb94c9a2305708a7dbe (commit)
   via  3f26eb3064ccbd715140cd12b6c51e84d5d8c801 (commit)
   via  d07e1b27d9f92182a64bb7981416ea0eeb963764 (commit)
  from  da588825475697068e2f3babc092c2cc4f09a31b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=253db6906ca42d7e02dadbb94c9a2305708a7dbe
commit 253db6906ca42d7e02dadbb94c9a2305708a7dbe
Merge: da58882 3f26eb3
Author: Brad King 
AuthorDate: Mon Feb 27 13:16:42 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 13:16:42 2017 -0500

Merge topic 'cmake-xcode-schemes' into next

3f26eb30 Xcode: Add documentation for schema generator
d07e1b27 Xcode: Write shared schemes based on the default files generated 
by Xcode


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f26eb3064ccbd715140cd12b6c51e84d5d8c801
commit 3f26eb3064ccbd715140cd12b6c51e84d5d8c801
Author: Gregor Jasny 
AuthorDate: Wed Feb 22 17:51:41 2017 +0100
Commit: Brad King 
CommitDate: Mon Feb 27 13:15:55 2017 -0500

Xcode: Add documentation for schema generator

diff --git a/Help/manual/cmake-properties.7.rst 
b/Help/manual/cmake-properties.7.rst
index 5fad10c..b4e9c1b 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -45,6 +45,7 @@ Properties of Global Scope
/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS
/prop_gbl/USE_FOLDERS
/prop_gbl/XCODE_EMIT_EFFECTIVE_PLATFORM_NAME
+   /prop_gbl/XCODE_GENERATE_SCHEME
 
 .. _`Directory Properties`:
 
diff --git a/Help/prop_gbl/XCODE_GENERATE_SCHEME.rst 
b/Help/prop_gbl/XCODE_GENERATE_SCHEME.rst
new file mode 100644
index 000..be8b5b0
--- /dev/null
+++ b/Help/prop_gbl/XCODE_GENERATE_SCHEME.rst
@@ -0,0 +1,11 @@
+XCODE_GENERATE_SCHEME
+-
+
+If enabled, the Xcode generator will generate schema files. Those are
+are useful to invoke analyze, archive, build-for-testing and test
+actions from the command line.
+
+.. note::
+
+  The Xcode Schema Generator is still experimental and subject to
+  change.
diff --git a/Help/release/dev/cmake-xcode-schemes.rst 
b/Help/release/dev/cmake-xcode-schemes.rst
new file mode 100644
index 000..27c19d7
--- /dev/null
+++ b/Help/release/dev/cmake-xcode-schemes.rst
@@ -0,0 +1,6 @@
+cmake-xcode-schemes
+---
+
+* The :generator:`Xcode` generator got the ability to create schema files.
+  This is still an experimental feature and can be activated by setting the
+  :prop_gbl:`XCODE_GENERATE_SCHEME` global property to a ``TRUE`` value.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d07e1b27d9f92182a64bb7981416ea0eeb963764
commit d07e1b27d9f92182a64bb7981416ea0eeb963764
Author: Gusts Kaksis 
AuthorDate: Wed Jan 18 16:20:09 2017 +0200
Commit: Brad King 
CommitDate: Mon Feb 27 13:15:03 2017 -0500

Xcode: Write shared schemes based on the default files generated by Xcode

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 3b49f72..76b98fc 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -639,6 +639,7 @@ if(APPLE)
   set(SRCS ${SRCS}
 cmXCodeObject.cxx
 cmXCode21Object.cxx
+cmXCodeScheme.cxx
 cmGlobalXCodeGenerator.cxx
 cmGlobalXCodeGenerator.h
 cmLocalXCodeGenerator.cxx
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 8627cf2..8acea45 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -28,6 +28,7 @@
 #include "cmTarget.h"
 #include "cmXCode21Object.h"
 #include "cmXCodeObject.h"
+#include "cmXCodeScheme.h"
 #include "cm_auto_ptr.hxx"
 #include "cmake.h"
 
@@ -3327,6 +3328,15 @@ void cmGlobalXCodeGenerator::OutputXCodeProject(
 return;
   }
   this->WriteXCodePBXProj(fout, root, generators);
+
+  // Since the lowest available Xcode version for testing was 7.0,
+  // I'm setting this as a limit then
+  if (this->GetCMakeInstance()->GetState()->GetGlobalPropertyAsBool(
+"XCODE_GENERATE_SCHEME") &&
+  this->XcodeVersion >= 70) {
+this->OutputXCodeSharedSchemes(xcodeDir, root);
+  }
+
   this->ClearXCodeObjects();
 
   // Since this call may have created new cache entries, save the cache:
@@ -3335,6 +3345,24 @@ void cmGlobalXCodeGenerator::OutputXCodeProject(
 root->GetBinaryDirectory());
 }
 
+void cmGlobalXCodeGenerator::OutputXCodeSharedSchemes(
+  const std::string& xcProjDir, cmLocalGenerator* root)
+{
+  for 

Re: [CMake] RPATH cross-compile issue with CHECK_*_EXISTS

[Brad King]

On 02/07/2017 04:40 AM, Ray Donnelly wrote:
>>> I have a PR that asks the linker (via the compiler) what its implicit
>>> search directories are instead.
>>>
>>> It is the right way to do it IMHO, but I need to find time to finish
>>> it unfortunately.
>>
>> Do you have a link to the PR?
>
> The PR Is closed pending me writing a test-case, but I just now
> updated to the my latest version and rebased on top of master:

The MR was:

 https://gitlab.kitware.com/cmake/cmake/merge_requests/207

See discussion there for why it has not yet been accepted.  Basically
I'd like to see a clear explanation of the use case.  The case described
in the MR looks to me like the custom compiler should be configured to
always pass the needed rpath flags to the linker.

On 02/06/2017 06:16 PM, Jörg Krause wrote:
> I did a git bisect. The behaviour was introduced in commit
> 896ad251de49f167f4ce3cbbcf9a6cce85a16681 [1].

Thanks for the bisect.  I don't think there is anything wrong with that
change on its own.  It merely exposed some existing behavior in a new case.

> My suggestion is to set FIND_LIBRARY_USE_LIB32_PATHS and
> FIND_LIBRARY_USE_LIB64_PATHS to FALSE when cross-compiling on Linux.

These are set on by default in `Modules/Platform/UnixPaths.cmake` but
disabled on Debian by `Modules/Platform/Linux.cmake` except when
cross compiling.  If a toolchain file specifies CMAKE_SYSTEM_NAME
such that a custom `Platform/MySystem.cmake` file is loaded then
the latter can set them as needed for the target platform.

-Brad
-- 

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://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-602-ga04f037

[Brad King]

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  a04f037c1c2286856e26f7190fdf7a816ac37cc6 (commit)
   via  c1aaf8a61defe3e01e8526b99d8919b9618d1ba9 (commit)
  from  d8227ed0bd89990b39407dd2e0486bea2c337d7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a04f037c1c2286856e26f7190fdf7a816ac37cc6
commit a04f037c1c2286856e26f7190fdf7a816ac37cc6
Merge: d8227ed c1aaf8a
Author: Brad King 
AuthorDate: Mon Feb 27 10:32:50 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 10:32:50 2017 -0500

Merge topic 'cmake-host-system-name' into next

c1aaf8a6 Fix CMAKE_HOST_SYSTEM_NAME on SunOS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1aaf8a61defe3e01e8526b99d8919b9618d1ba9
commit c1aaf8a61defe3e01e8526b99d8919b9618d1ba9
Author: Brad King 
AuthorDate: Mon Feb 27 10:30:20 2017 -0500
Commit: Brad King 
CommitDate: Mon Feb 27 10:30:45 2017 -0500

Fix CMAKE_HOST_SYSTEM_NAME on SunOS

In commit 0bbd993f (Make CMAKE_HOST_SYSTEM_NAME available in scripting
context, 2016-12-26) we added a call to `uname` that checks for a zero
return value.  However, on Solaris the `uname(2)` manual [1] says that
on success a non-negative value is returned.  Fix our return code check
so that we detect the `SunOS` name correctly.

[1] https://docs.oracle.com/cd/E53394_01/html/E54765/uname-2.html

diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx
index 80e494b..d2c9d73 100644
--- a/Source/cmStateSnapshot.cxx
+++ b/Source/cmStateSnapshot.cxx
@@ -308,7 +308,7 @@ void cmStateSnapshot::SetDefaultDefinitions()
   this->SetDefinition("CMAKE_HOST_UNIX", "1");
 
   struct utsname uts_name;
-  if (uname(_name) == 0) {
+  if (uname(_name) >= 0) {
 this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", uts_name.sysname);
   }
 #endif

---

Summary of changes:
 Source/cmStateSnapshot.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-600-gd8227ed

[Brad King]

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  d8227ed0bd89990b39407dd2e0486bea2c337d7e (commit)
   via  f639bd9a60502c680fce44c5ef0b63b131b874dc (commit)
  from  539150dd10ab582f5bc2d95dffe82b40cf4cd597 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8227ed0bd89990b39407dd2e0486bea2c337d7e
commit d8227ed0bd89990b39407dd2e0486bea2c337d7e
Merge: 539150d f639bd9
Author: Brad King 
AuthorDate: Mon Feb 27 09:38:33 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 09:38:33 2017 -0500

Merge topic 'libuv-solaris-10' into next

f639bd9a libuv: Compile as C 90 on Solaris 10


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f639bd9a60502c680fce44c5ef0b63b131b874dc
commit f639bd9a60502c680fce44c5ef0b63b131b874dc
Author: Brad King 
AuthorDate: Mon Feb 27 09:37:39 2017 -0500
Commit: Brad King 
CommitDate: Mon Feb 27 09:37:39 2017 -0500

libuv: Compile as C 90 on Solaris 10

diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index 1899f83..6632a1e 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -224,6 +224,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 list(APPEND uv_defines
   _XOPEN_SOURCE=500
   )
+if(CMAKE_C_STANDARD)
+  set(CMAKE_C_STANDARD 90)
+endif()
   else()
 list(APPEND uv_defines
   _XOPEN_SOURCE=600

---

Summary of changes:
 Utilities/cmlibuv/CMakeLists.txt |3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-598-g539150d

[Brad King]

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  539150dd10ab582f5bc2d95dffe82b40cf4cd597 (commit)
   via  48b56504bf2c9be2151cc507aaf5d59e50f456ae (commit)
  from  eedc69b8a1f119f40fa48d7ed950974ea7140fd4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=539150dd10ab582f5bc2d95dffe82b40cf4cd597
commit 539150dd10ab582f5bc2d95dffe82b40cf4cd597
Merge: eedc69b 48b5650
Author: Brad King 
AuthorDate: Mon Feb 27 09:28:02 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 09:28:02 2017 -0500

Merge topic 'autogen_json_fix' into next

48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48b56504bf2c9be2151cc507aaf5d59e50f456ae
commit 48b56504bf2c9be2151cc507aaf5d59e50f456ae
Author: Sebastian Holtermann 
AuthorDate: Fri Feb 24 18:27:41 2017 +0100
Commit: Sebastian Holtermann 
CommitDate: Sun Feb 26 19:05:56 2017 +0100

Autogen: Fix for Q_PLUGIN_METADATA change detection test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 257c187..dc631c6 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -232,55 +232,56 @@ if (NOT QT_TEST_VERSION STREQUAL 4)
   endif()
 
   set(timeformat "%Y%j%H%M%S")
-  set(mocPluginBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
-  find_library(style_a_file "PluginStyleA" "${mocPluginBinDir}")
-  find_library(style_b_file "PluginStyleB" "${mocPluginBinDir}")
-  find_library(style_c_file "PluginStyleC" "${mocPluginBinDir}")
-  find_library(style_d_file "PluginStyleD" "${mocPluginBinDir}")
-
-  file(TIMESTAMP "${style_a_file}" style_a_before "${timeformat}")
-  file(TIMESTAMP "${style_b_file}" style_b_before "${timeformat}")
-  file(TIMESTAMP "${style_c_file}" style_c_before "${timeformat}")
-  file(TIMESTAMP "${style_d_file}" style_d_before "${timeformat}")
-
-  # Ensure that the timestamp will change and touch the json files
+  set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin")
+  set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
+  find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+  find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+  find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+  find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+
+  file(TIMESTAMP "${plAFile}" plABefore "${timeformat}")
+  file(TIMESTAMP "${plBFile}" plBBefore "${timeformat}")
+  file(TIMESTAMP "${plCFile}" plCBefore "${timeformat}")
+  file(TIMESTAMP "${plDFile}" plDBefore "${timeformat}")
+
+  # Ensure that the timestamp will change and change the json files
   execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
-  execute_process(COMMAND "${CMAKE_COMMAND}" -E touch 
"${mocPluginBinDir}/jsonFiles/StyleC.json")
-  execute_process(COMMAND "${CMAKE_COMMAND}" -E touch 
"${mocPluginBinDir}/jsonFiles/sub/StyleD.json")
-  execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY 
"${mocPluginBinDir}")
+  configure_file("${mocPlugSrcDir}/jsonIn/StyleD.json" 
"${mocPlugBinDir}/jsonFiles/StyleC.json")
+  configure_file("${mocPlugSrcDir}/jsonIn/StyleC.json" 
"${mocPlugBinDir}/jsonFiles/sub/StyleD.json")
+  execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY 
"${mocPlugBinDir}")
 
-  file(TIMESTAMP "${style_a_file}" style_a_after "${timeformat}")
-  file(TIMESTAMP "${style_b_file}" style_b_after "${timeformat}")
-  file(TIMESTAMP "${style_c_file}" style_c_after "${timeformat}")
-  file(TIMESTAMP "${style_d_file}" style_d_after "${timeformat}")
+  file(TIMESTAMP "${plAFile}" plAAfter "${timeformat}")
+  file(TIMESTAMP "${plBFile}" plBAfter "${timeformat}")
+  file(TIMESTAMP "${plCFile}" plCAfter "${timeformat}")
+  file(TIMESTAMP "${plDFile}" plDAfter "${timeformat}")
 
-  if (style_a_after GREATER style_a_before)
-message(SEND_ERROR "file (${style_a_file}) should not have changed!")
+  if (plAAfter GREATER plABefore)
+message(SEND_ERROR "file (${plAFile}) should not have changed!")
   endif()
-  if (style_b_after GREATER style_b_before)
-message(SEND_ERROR "file (${style_b_file}) should not have changed!")
+  if (plBAfter GREATER plBBefore)
+message(SEND_ERROR "file (${plBFile}) should not have changed!")
   endif()
-  if (NOT style_c_after GREATER style_c_before)
-message(SEND_ERROR "file (${style_c_file}) should have changed!")
+  if (NOT plCAfter GREATER plCBefore)
+message(SEND_ERROR "file (${plCFile}) should 

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-596-geedc69b

[Brad King]

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  eedc69b8a1f119f40fa48d7ed950974ea7140fd4 (commit)
   via  73a6d4566a9fa13ffaef2fbe808a220ba867 (commit)
  from  af064e58c0fdde06bb4f1c93d4c9e7acd94efc07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eedc69b8a1f119f40fa48d7ed950974ea7140fd4
commit eedc69b8a1f119f40fa48d7ed950974ea7140fd4
Merge: af064e5 73a6d45
Author: Brad King 
AuthorDate: Mon Feb 27 09:26:13 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 09:26:13 2017 -0500

Merge topic 'cache-xaml-resx-headers' into next

73a6d456 VS: Cache the list of xaml and resx headers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73a6d4566a9fa13ffaef2fbe808a220ba867
commit 73a6d4566a9fa13ffaef2fbe808a220ba867
Author: Dmitry Kochkin 
AuthorDate: Sat Feb 25 22:56:13 2017 +0100
Commit: Brad King 
CommitDate: Mon Feb 27 09:22:08 2017 -0500

VS: Cache the list of xaml and resx headers

Speed up VS project generation with many such headers.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5815210..47d685d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -711,12 +711,18 @@ void cmGeneratorTarget::GetExternalObjects(
   IMPLEMENT_VISIT(ExternalObjects);
 }
 
-void cmGeneratorTarget::GetExpectedResxHeaders(std::set& srcs,
+void cmGeneratorTarget::GetExpectedResxHeaders(std::set& headers,
const std::string& config) const
 {
-  ResxData data;
-  IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData)
-  srcs = data.ExpectedResxHeaders;
+  HeadersCacheType::const_iterator it = this->ResxHeadersCache.find(config);
+  if (it == this->ResxHeadersCache.end()) {
+ResxData data;
+IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData)
+it = this->ResxHeadersCache
+   .insert(std::make_pair(config, data.ExpectedResxHeaders))
+   .first;
+  }
+  headers = it->second;
 }
 
 void cmGeneratorTarget::GetResxSources(std::vector& srcs,
@@ -748,9 +754,15 @@ void 
cmGeneratorTarget::GetCertificates(std::vector& data,
 void cmGeneratorTarget::GetExpectedXamlHeaders(std::set& headers,
const std::string& config) const
 {
-  XamlData data;
-  IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
-  headers = data.ExpectedXamlHeaders;
+  HeadersCacheType::const_iterator it = this->XamlHeadersCache.find(config);
+  if (it == this->XamlHeadersCache.end()) {
+XamlData data;
+IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData)
+it = this->XamlHeadersCache
+   .insert(std::make_pair(config, data.ExpectedXamlHeaders))
+   .first;
+  }
+  headers = it->second;
 }
 
 void cmGeneratorTarget::GetExpectedXamlSources(std::set& srcs,
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 689fbda..e72e0a6 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -739,6 +739,10 @@ private:
   bool ComputePDBOutputDir(const std::string& kind, const std::string& config,
std::string& out) const;
 
+  typedef std::map HeadersCacheType;
+  mutable HeadersCacheType ResxHeadersCache;
+  mutable HeadersCacheType XamlHeadersCache;
+
 public:
   const std::vector& GetLinkImplementationClosure(
 const std::string& config) const;

---

Summary of changes:
 Source/cmGeneratorTarget.cxx |   26 +++---
 Source/cmGeneratorTarget.h   |4 
 2 files changed, 23 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-315-gcdb6d7d

[Brad King]

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  cdb6d7df970fcaaf6cda1bef9955351222e1bcde (commit)
   via  aa45291e7f90749cd6e0f1d7d02f9536c30731ce (commit)
   via  dab2ff3e237f1c3c2430e0661281719185ef4eb1 (commit)
   via  ad3bf56dd210888c94fac33238b35ddccf3a8053 (commit)
   via  8ea060f960c1aa9d2fd2da6a035f03a64d08863b (commit)
   via  52a3022df62c0b2ec6c51f70e8eb862dbcde3c9a (commit)
  from  f79efeac7939663e0fd67b4087f6ead08402189f (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:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, release, updated. v3.8.0-rc1-56-gdab2ff3

[Brad King]

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  dab2ff3e237f1c3c2430e0661281719185ef4eb1 (commit)
   via  a9fa6a2c777bf68ac1c6d885fd07b21bf98e3f77 (commit)
   via  ad3bf56dd210888c94fac33238b35ddccf3a8053 (commit)
   via  feff52d42ca18a52fd99e8fdfd3093c3a94eb498 (commit)
   via  8ea060f960c1aa9d2fd2da6a035f03a64d08863b (commit)
   via  666ad1df2dc5b181a40d831c125529fe7e9bf0b4 (commit)
   via  efac65d67b32c407044db6536da4f43ed9546be7 (commit)
  from  5eb4d9d80bbdbf316a1ccb2b062dcc9f34f95c3a (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:
 Modules/ExternalProject.cmake|2 +-
 Source/cmGeneratorTarget.cxx |2 +-
 Source/cmNinjaTargetGenerator.cxx|7 +++
 Tests/ObjectLibrary/A/CMakeLists.txt |1 +
 4 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-590-gcff4986

[Brad King]

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  cff4986415b485168d151c09e1cddb24b81efb56 (commit)
   via  cdb6d7df970fcaaf6cda1bef9955351222e1bcde (commit)
   via  aa45291e7f90749cd6e0f1d7d02f9536c30731ce (commit)
   via  dab2ff3e237f1c3c2430e0661281719185ef4eb1 (commit)
   via  ad3bf56dd210888c94fac33238b35ddccf3a8053 (commit)
   via  8ea060f960c1aa9d2fd2da6a035f03a64d08863b (commit)
   via  52a3022df62c0b2ec6c51f70e8eb862dbcde3c9a (commit)
  from  6687a5410d28c9eb5d1c074b068e74049f120fe4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cff4986415b485168d151c09e1cddb24b81efb56
commit cff4986415b485168d151c09e1cddb24b81efb56
Merge: 6687a54 cdb6d7d
Author: Brad King 
AuthorDate: Mon Feb 27 09:12:47 2017 -0500
Commit: Brad King 
CommitDate: Mon Feb 27 09:12:47 2017 -0500

Merge branch 'master' into next


---

Summary of changes:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-307-ge348d8d

[Brad King]

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  e348d8db559fd1d79f936d42582eb628779d23ad (commit)
   via  feff52d42ca18a52fd99e8fdfd3093c3a94eb498 (commit)
  from  9b02283a1fdb63b0cf9755ae37a0d22fc6f4dbf4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e348d8db559fd1d79f936d42582eb628779d23ad
commit e348d8db559fd1d79f936d42582eb628779d23ad
Merge: 9b02283 feff52d4
Author: Brad King 
AuthorDate: Mon Feb 27 09:11:22 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 09:11:22 2017 -0500

Merge topic 'object-library-compile-pdb'

feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library


---

Summary of changes:
 Source/cmGeneratorTarget.cxx |2 +-
 Tests/ObjectLibrary/A/CMakeLists.txt |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-305-g9b02283

[Brad King]

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  9b02283a1fdb63b0cf9755ae37a0d22fc6f4dbf4 (commit)
   via  b35a949bb6ce6ae5204de2cf867dac903cb71262 (commit)
   via  01347954187ebccf83fc7540163f150a5f430c36 (commit)
  from  73909e242138ba01c1ce5ebe04fa16a9a8e2e675 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b02283a1fdb63b0cf9755ae37a0d22fc6f4dbf4
commit 9b02283a1fdb63b0cf9755ae37a0d22fc6f4dbf4
Merge: 73909e2 b35a949
Author: Brad King 
AuthorDate: Mon Feb 27 09:11:20 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 09:11:20 2017 -0500

Merge topic 'test-objlib-deps-cleanup'

b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C
01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay


---

Summary of changes:
 Tests/RunCMake/ObjectLibrary/Dependencies.cmake |   10 +++---
 Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake |   20 +---
 Tests/RunCMake/ObjectLibrary/depends_lib.c  |7 +++
 Tests/RunCMake/ObjectLibrary/depends_lib.cpp|7 ---
 Tests/RunCMake/ObjectLibrary/depends_main.c |7 +++
 Tests/RunCMake/ObjectLibrary/depends_main.cpp   |7 ---
 Tests/RunCMake/ObjectLibrary/depends_obj0.c |4 
 Tests/RunCMake/ObjectLibrary/depends_obj0.cpp   |4 
 Tests/RunCMake/ObjectLibrary/depends_obj1.c |4 
 Tests/RunCMake/ObjectLibrary/depends_obj1.cpp   |4 
 10 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 Tests/RunCMake/ObjectLibrary/depends_lib.c
 delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_lib.cpp
 create mode 100644 Tests/RunCMake/ObjectLibrary/depends_main.c
 delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_main.cpp
 create mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj0.c
 delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj0.cpp
 create mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj1.c
 delete mode 100644 Tests/RunCMake/ObjectLibrary/depends_obj1.cpp


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.8.0-rc1-302-g73909e2

[Brad King]

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  73909e242138ba01c1ce5ebe04fa16a9a8e2e675 (commit)
   via  666ad1df2dc5b181a40d831c125529fe7e9bf0b4 (commit)
  from  adcade6088a8bbe19002ac88f724d25ac95597c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73909e242138ba01c1ce5ebe04fa16a9a8e2e675
commit 73909e242138ba01c1ce5ebe04fa16a9a8e2e675
Merge: adcade6 666ad1d
Author: Brad King 
AuthorDate: Mon Feb 27 09:11:17 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 09:11:17 2017 -0500

Merge topic 'ninja-no-full-path'

666ad1df Revert "Ninja: Use full path for all source files"

diff --cc Source/cmNinjaTargetGenerator.cxx
index f096416,5c85dfa..b1f26e4
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -380,12 -373,11 +380,12 @@@ void cmNinjaTargetGenerator::WriteLangu
  
  void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
  {
 -  cmLocalGenerator::RuleVariables vars;
 -  vars.RuleLauncher = "RULE_LAUNCH_COMPILE";
 -  vars.CMTarget = this->GetGeneratorTarget();
 +  cmRulePlaceholderExpander::RuleVariables vars;
 +  vars.CMTargetName = this->GetGeneratorTarget()->GetName().c_str();
 +  vars.CMTargetType =
 +cmState::GetTargetTypeName(this->GetGeneratorTarget()->GetType());
vars.Language = lang.c_str();
-   vars.Source = "$IN_ABS";
+   vars.Source = "$in";
vars.Object = "$out";
vars.Defines = "$DEFINES";
vars.Includes = "$INCLUDES";

---

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)

[Steven Newbury]

On Mon, 2017-02-27 at 08:36 -0500, Brad King wrote:
> On 02/26/2017 08:30 PM, Steven Newbury wrote:
> > This is based on the patch attached to the
> > original Manits bug:
> > https://cmake.org/Bug/view.php?id=15994#c40584
> > 
> > I have cleaned up all the hard coded paths so
> > hopefully it has now no effect on non-x32 systems.
> > 
> > It probably needs tests to be updated to support
> > x32 where appropriate.
> 
> Thanks!
> 
> Since the related LIB_SUFFIX thread was started our preferred
> path for contributions has changed.  Instead of posting patches
> on the mailing list, we now use gitlab.kitware.com merge requests.
> Please see `CONTRIBUTING.rst` for details.
> 
> Thanks,
> -Brad

Right, I'll do that.


signature.asc
Description: This is a digitally signed message part
-- 

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://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] [PATCH v2] Allow custom lib suffix be used as find path

[Brad King]

On 02/25/2017 02:15 PM, Christian Schmidbauer wrote:
> Inspired by commit 896ad25 for bug #11260, this commit allows to use the
> variable CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX to be used as find path.
> Allowing the find path to be more deterministic on custom setups.
> 
> A similar idea has already been suggested in #10287 and is required for
> bug #15994.
> 
> v2: - Change path variable a string to be specified as suffix directly.
> - Make path variable non-global
> - Fix find_library test
> - strip FindPackage, as testing is ambigous in such scenario

Thanks!

Since this thread was started our preferred path for contributions
has changed.  Instead of posting patches on the mailing list, we now
use gitlab.kitware.com merge requests.  Please see `CONTRIBUTING.rst`
for details.

Thanks,
-Brad

-- 

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://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] [RESEND] [PATCH] x32-abi support #15994 (without line wrapping!)

[Brad King]

On 02/26/2017 08:30 PM, Steven Newbury wrote:
> This is based on the patch attached to the
> original Manits bug:
> https://cmake.org/Bug/view.php?id=15994#c40584
> 
> I have cleaned up all the hard coded paths so
> hopefully it has now no effect on non-x32 systems.
> 
> It probably needs tests to be updated to support
> x32 where appropriate.

Thanks!

Since the related LIB_SUFFIX thread was started our preferred
path for contributions has changed.  Instead of posting patches
on the mailing list, we now use gitlab.kitware.com merge requests.
Please see `CONTRIBUTING.rst` for details.

Thanks,
-Brad

-- 

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://public.kitware.com/mailman/listinfo/cmake-developers

[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-570-gcb2ea66

[Brad King]

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  cb2ea6642dced14a1f0e0929ea8a9073cdf7f9b8 (commit)
   via  8fe228929fb69ce7d157e3f88ed9b33e145d6f3b (commit)
  from  316aa77eea2dff8e982257904344c46336673fce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb2ea6642dced14a1f0e0929ea8a9073cdf7f9b8
commit cb2ea6642dced14a1f0e0929ea8a9073cdf7f9b8
Merge: 316aa77 8fe2289
Author: Brad King 
AuthorDate: Mon Feb 27 06:13:00 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 27 06:13:00 2017 -0500

Merge topic '16607-error-out-on-non-seekable-input-files' into next

8fe22892 fixup! cmListFileLexer: bail out on seek-errors


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fe228929fb69ce7d157e3f88ed9b33e145d6f3b
commit 8fe228929fb69ce7d157e3f88ed9b33e145d6f3b
Author: Brad King 
AuthorDate: Mon Feb 27 06:09:49 2017 -0500
Commit: Brad King 
CommitDate: Mon Feb 27 06:09:49 2017 -0500

fixup! cmListFileLexer: bail out on seek-errors

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index bd92013..6423bfd 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -290,7 +290,7 @@ add_RunCMake_test(target_link_libraries)
 
 add_RunCMake_test(target_compile_features)
 add_RunCMake_test(CheckModules)
-add_RunCMake_test(CommandLine)
+add_RunCMake_test(CommandLine -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
 add_RunCMake_test(CommandLineTar)
 
 add_RunCMake_test(install)
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake 
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 18d487e..b213ee2 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.1)
+
 include(RunCMake)
 
 run_cmake_command(NoArgs ${CMAKE_COMMAND})
@@ -309,6 +311,6 @@ function(reject_fifo)
 run_cmake_command(reject_fifo ${BASH_EXECUTABLE} -c 
${BASH_COMMAND_ARGUMENT})
   endif()
 endfunction()
-if(CMAKE_HOST_UNIX AND NOT CYGWIN)
+if(CMAKE_HOST_UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
   reject_fifo()
 endif()

---

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |2 +-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake |4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits