[Cmake-commits] CMake branch, next, updated. v2.8.7-3302-g10310a6

[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  10310a62e06c075e713e03187d2d89c4b0e727fd (commit)
       via  fb7348f64455242dcbbb3837c697c9bf88414ae2 (commit)
      from  9c86ef64f25f7db4714deff37b7c4b41abc48757 (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=10310a62e06c075e713e03187d2d89c4b0e727fd
commit 10310a62e06c075e713e03187d2d89c4b0e727fd
Merge: 9c86ef6 fb7348f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 20 15:18:35 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 20 15:18:35 2012 -0400

    Merge topic 'watcom-object-library' into next
    
    fb7348f Fix ObjectLibrary test on Watcom


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb7348f64455242dcbbb3837c697c9bf88414ae2
commit fb7348f64455242dcbbb3837c697c9bf88414ae2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 20 15:06:16 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 20 15:09:57 2012 -0400

    Fix ObjectLibrary test on Watcom
    
    The Watcom compiler interprets "-DB" as option
    
     -db generate browsing information
    
    so define "A_DEF" and "B_DEF" instead of just "A" and "B".
    
    Skip CMAKE_SHARED_LIBRARY_C_FLAGS for Watcom because it is set to
    
     -bd  build Dynamic link library
    
    which adds a DLL entry point to each object.

diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt
index e0a620e..121a8ac 100644
--- a/Tests/ObjectLibrary/A/CMakeLists.txt
+++ b/Tests/ObjectLibrary/A/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Add -fPIC so objects can be used in shared libraries.
 # TODO: Need property for this.
-if(CMAKE_SHARED_LIBRARY_C_FLAGS)
+if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
   set(CMAKE_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS}")
 endif()
 
-add_definitions(-DA)
+add_definitions(-DA_DEF)
 
 add_custom_command(
   OUTPUT a1.c
diff --git a/Tests/ObjectLibrary/A/a.h b/Tests/ObjectLibrary/A/a.h
index 6bfbc82..7259f98 100644
--- a/Tests/ObjectLibrary/A/a.h
+++ b/Tests/ObjectLibrary/A/a.h
@@ -1,6 +1,6 @@
-#ifndef A
-# error "A not defined"
+#ifndef A_DEF
+# error "A_DEF not defined"
 #endif
-#ifdef B
-# error "B must not be defined"
+#ifdef B_DEF
+# error "B_DEF must not be defined"
 #endif
diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt
index 498d45d..67172d1 100644
--- a/Tests/ObjectLibrary/B/CMakeLists.txt
+++ b/Tests/ObjectLibrary/B/CMakeLists.txt
@@ -5,11 +5,11 @@ endif()
 
 # Add -fPIC so objects can be used in shared libraries.
 # TODO: Need property for this.
-if(CMAKE_SHARED_LIBRARY_C_FLAGS)
+if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)
   set(CMAKE_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS}")
 endif()
 
-add_definitions(-DB)
+add_definitions(-DB_DEF)
 add_library(B OBJECT b1.c b2.c)
 add_library(Bexport OBJECT b1${vs6}.c b2${vs6}.c)
 set_property(TARGET Bexport PROPERTY COMPILE_DEFINITIONS Bexport)
diff --git a/Tests/ObjectLibrary/B/b.h b/Tests/ObjectLibrary/B/b.h
index 632004d..11b22f4 100644
--- a/Tests/ObjectLibrary/B/b.h
+++ b/Tests/ObjectLibrary/B/b.h
@@ -1,8 +1,8 @@
-#ifdef A
-# error "A must not be defined"
+#ifdef A_DEF
+# error "A_DEF must not be defined"
 #endif
-#ifndef B
-# error "B not defined"
+#ifndef B_DEF
+# error "B_DEF not defined"
 #endif
 #if defined(_WIN32) && defined(Bexport)
 # define EXPORT_B __declspec(dllexport)

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

Summary of changes:
 Tests/ObjectLibrary/A/CMakeLists.txt |    4 ++--
 Tests/ObjectLibrary/A/a.h            |    8 ++++----
 Tests/ObjectLibrary/B/CMakeLists.txt |    4 ++--
 Tests/ObjectLibrary/B/b.h            |    8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake