kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'watcom-object-library' 

fb7348f Fix ObjectLibrary test on Watcom
This commit is contained in:
David Cole 2012-03-21 13:27:10 -04:00 committed by CMake Topic Stage
parent a72893da36 fb7348f644
commit 7e94e6b525
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/ObjectLibrary/A/CMakeLists.txt
View File

@ -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

8
Tests/ObjectLibrary/A/a.h
View File

@ -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

4
Tests/ObjectLibrary/B/CMakeLists.txt
View File

@ -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)

8
Tests/ObjectLibrary/B/b.h
View File

@ -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)