[Cmake-commits] CMake branch, next, updated. v2.8.3-979-ga473dd4

[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  a473dd40f79c9844adf182286478a0d8d1063153 (commit)
       via  853de2ed1288dbf891778db30653927d0e223a44 (commit)
       via  d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb (commit)
      from  d39724d889a64cb19fcaa85a7c735ad828c7a9dc (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=a473dd40f79c9844adf182286478a0d8d1063153
commit a473dd40f79c9844adf182286478a0d8d1063153
Merge: d39724d 853de2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 10:09:46 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 17 10:09:46 2010 -0500

    Merge topic 'resolve/tests-if-CYGWIN' into next
    
    853de2e Merge branch 'custom-command-generator-expressions' into resolve/tests-if-CYGWIN
    d89e238 Cygwin: Fix tests to check CYGWIN instead of WIN32


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=853de2ed1288dbf891778db30653927d0e223a44
commit 853de2ed1288dbf891778db30653927d0e223a44
Merge: d89e238 45e1953
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 10:07:19 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 17 10:07:19 2010 -0500

    Merge branch 'custom-command-generator-expressions' into resolve/tests-if-CYGWIN
    
    The tests-if-CYGWIN topic made a change to Tests/Testing/CMakeLists.txt
    in code that the custom-command-generator-expressions topic moved to the
    Tests/PerConfig/CMakeLists.txt file.  Make the same change to the same
    content in the new file.  (Only a small part of the file moved so rename
    detection did not do this automatically.)

diff --cc Tests/PerConfig/CMakeLists.txt
index 0000000,a45abc8..2a55d33
mode 000000,100644..100644
--- a/Tests/PerConfig/CMakeLists.txt
+++ b/Tests/PerConfig/CMakeLists.txt
@@@ -1,0 -1,33 +1,33 @@@
+ project(PerConfig C)
+ 
+ # Targets with per-configuration names.
+ ADD_LIBRARY(pcStatic STATIC pcStatic.c)
+ SET_PROPERTY(TARGET pcStatic PROPERTY RELEASE_POSTFIX -opt)
+ SET_PROPERTY(TARGET pcStatic PROPERTY DEBUG_POSTFIX -dbg)
+ ADD_LIBRARY(pcShared SHARED pcShared.c)
+ SET_PROPERTY(TARGET pcShared PROPERTY RELEASE_POSTFIX -opt)
+ SET_PROPERTY(TARGET pcShared PROPERTY DEBUG_POSTFIX -dbg)
+ SET_PROPERTY(TARGET pcShared PROPERTY VERSION 1.2)
+ SET_PROPERTY(TARGET pcShared PROPERTY SOVERSION 3)
 -IF(NOT WIN32)
++IF(UNIX AND NOT CYGWIN)
+   SET(soname_file -DpcShared_soname_file=$<TARGET_SONAME_FILE:pcShared>)
+ ENDIF()
+ ADD_EXECUTABLE(perconfig perconfig.c)
+ TARGET_LINK_LIBRARIES(perconfig pcStatic pcShared)
+ SET_PROPERTY(TARGET perconfig PROPERTY RELEASE_POSTFIX -opt)
+ SET_PROPERTY(TARGET perconfig PROPERTY DEBUG_POSTFIX -dbg)
+ 
+ SET(PerConfig_COMMAND
+   ${CMAKE_COMMAND}
+     -Dconfiguration=$<CONFIGURATION>
+     -Dperconfig_file_dir=$<TARGET_FILE_DIR:perconfig>
+     -Dperconfig_file_name=$<TARGET_FILE_NAME:perconfig>
+     -Dperconfig_file=$<TARGET_FILE:perconfig>
+     -DpcStatic_file=$<TARGET_FILE:pcStatic>
+     -DpcStatic_linker_file=$<TARGET_LINKER_FILE:pcStatic>
+     -DpcShared_file=$<TARGET_FILE:pcShared>
+     -DpcShared_linker_file=$<TARGET_LINKER_FILE:pcShared>
+     ${soname_file}
+     -P ${PerConfig_SOURCE_DIR}/perconfig.cmake
+     )
+ SET(PerConfig_COMMAND "${PerConfig_COMMAND}" PARENT_SCOPE)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb
commit d89e238e6c4b22fe3fde0f8e1e7987fb05f13aeb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 17 09:46:24 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 17 09:46:24 2010 -0500

    Cygwin: Fix tests to check CYGWIN instead of WIN32
    
    Use "UNIX AND NOT CYGWIN" to detect a "soname" platform.
    Use "WIN32 OR CYGWIN" to detect a "DLL" platform.

diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt
index 46d4d36..4440577 100644
--- a/Tests/Jump/Library/Shared/CMakeLists.txt
+++ b/Tests/Jump/Library/Shared/CMakeLists.txt
@@ -1,8 +1,8 @@
 ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
 
-IF(WIN32)
+IF(WIN32 OR CYGWIN)
   SET(SHARED_MUST_BE_IN_EXE_DIR 1)
-ENDIF(WIN32)
+ENDIF()
 
 IF(APPLE)
   SET(SHARED_MUST_BE_IN_EXE_DIR 1)
diff --git a/Tests/Testing/CMakeLists.txt b/Tests/Testing/CMakeLists.txt
index f857407..9e7a637 100644
--- a/Tests/Testing/CMakeLists.txt
+++ b/Tests/Testing/CMakeLists.txt
@@ -62,7 +62,7 @@ SET_PROPERTY(TARGET pcShared PROPERTY RELEASE_POSTFIX -opt)
 SET_PROPERTY(TARGET pcShared PROPERTY DEBUG_POSTFIX -dbg)
 SET_PROPERTY(TARGET pcShared PROPERTY VERSION 1.2)
 SET_PROPERTY(TARGET pcShared PROPERTY SOVERSION 3)
-IF(NOT WIN32)
+IF(UNIX AND NOT CYGWIN)
   SET(soname_file -DpcShared_soname_file=$<TARGET_SONAME_FILE:pcShared>)
 ENDIF()
 ADD_EXECUTABLE(perconfig perconfig.c)

-----------------------------------------------------------------------

Summary of changes:
 Tests/Jump/Library/Shared/CMakeLists.txt |    4 ++--
 Tests/PerConfig/CMakeLists.txt           |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake