[Cmake-commits] CMake branch, next, updated. v2.8.2-688-g2966fcb

Bill Hoffman bill.hoffman at kitware.com
Tue Sep 7 09:16:38 EDT 2010


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  2966fcb5515bb7e4f46d5544c335f4364a78875f (commit)
       via  7944e4e0ac37cb1423da2de7a203557b77372aac (commit)
      from  09f1930e2281919501ad71c3cf10a153555445d4 (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=2966fcb5515bb7e4f46d5544c335f4364a78875f
commit 2966fcb5515bb7e4f46d5544c335f4364a78875f
Merge: 09f1930 7944e4e
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 7 09:16:37 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 7 09:16:37 2010 -0400

    Merge topic 'allow_upper_case_cpp_and_others' into next
    
    7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work.

diff --cc Tests/CxxOnly/CMakeLists.txt
index ad3315c,d621499..5d27890
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@@ -2,10 -2,10 +2,10 @@@
  project (CxxOnly CXX)
  
  set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
- if(MSVC)
+ 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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7944e4e0ac37cb1423da2de7a203557b77372aac
commit 7944e4e0ac37cb1423da2de7a203557b77372aac
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Sep 7 09:14:57 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Sep 7 09:14:57 2010 -0400

    Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work.

diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 4654f44..d621499 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
 project (CxxOnly CXX)
 
 set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-if(MSVC)
+if(WIN32)
   set(EXTRA_SRCS test.CPP)
 endif()
 add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})

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

Summary of changes:
 Tests/CxxOnly/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list