[Cmake-commits] CMake branch, next, updated. v2.8.2-786-g5772c9e

[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  5772c9e7a0cb8070d2a1fa4801fef3490e247ba8 (commit)
       via  eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f (commit)
      from  f6f2e0cc72116e0144238f0b2f090d6eebadf6ed (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=5772c9e7a0cb8070d2a1fa4801fef3490e247ba8
commit 5772c9e7a0cb8070d2a1fa4801fef3490e247ba8
Merge: f6f2e0c eccc7d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 14 15:06:24 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 14 15:06:24 2010 -0400

    Merge topic 'resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others' into next
    
    eccc7d5 Merge branch 'allow_upper_case_cpp_and_others' into resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f
commit eccc7d5d267d7dc4eab027fab54ef4e7a63c8d4f
Merge: ed37fc3 7944e4e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 14 15:05:09 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 14 15:05:09 2010 -0400

    Merge branch 'allow_upper_case_cpp_and_others' into resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others
    
    Conflicts:
    	Tests/CxxOnly/CMakeLists.txt

diff --cc Tests/CxxOnly/CMakeLists.txt
index 0b2c1c5,d621499..5d27890
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@@ -2,7 -2,10 +2,10 @@@
  project (CxxOnly CXX)
  
  set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
- add_library(testcxx1.my STATIC libcxx1.cxx test.CPP)
+ if(WIN32)
+   set(EXTRA_SRCS test.CPP)
+ endif()
 -add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
++add_library(testcxx1.my STATIC libcxx1.cxx ${EXTRA_SRCS})
  add_library(testcxx2 SHARED libcxx2.cxx)
  add_executable (CxxOnly cxxonly.cxx)
 -target_link_libraries(CxxOnly testcxx1 testcxx2)
 +target_link_libraries(CxxOnly testcxx1.my testcxx2)

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

Summary of changes:


hooks/post-receive
-- 
CMake