Commit 7e94e6b5 authored by David Cole's avatar David Cole Committed by Kitware Robot
Browse files

Merge topic 'watcom-object-library'

fb7348f6 Fix ObjectLibrary test on Watcom
parents a72893da fb7348f6
# 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
......
#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
......@@ -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)
#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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment