ENH: more fixes for watcom
This commit is contained in:
parent
9891260a6d
commit
ac58fb88b9
@ -6,13 +6,16 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
|
|||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
|
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
|
||||||
|
|
||||||
# Link to CMake lib
|
IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
|
# Link to CMake lib
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
|
||||||
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
|
||||||
|
ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
|
|
||||||
|
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
|
||||||
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
|
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
|
||||||
LINK_LIBRARIES(${COMPLEX_LIBS})
|
LINK_LIBRARIES(${COMPLEX_LIBS})
|
||||||
|
|
||||||
|
@ -6,13 +6,16 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
|
|||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
|
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
|
||||||
|
|
||||||
# Link to CMake lib
|
IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
|
# Link to CMake lib
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
|
||||||
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
|
||||||
|
ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
|
|
||||||
|
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
|
||||||
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
|
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
|
||||||
LINK_LIBRARIES(${COMPLEX_LIBS})
|
LINK_LIBRARIES(${COMPLEX_LIBS})
|
||||||
|
|
||||||
|
@ -6,13 +6,16 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
|
|||||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
|
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
|
||||||
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
|
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
|
||||||
|
|
||||||
# Link to CMake lib
|
IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
|
# Link to CMake lib
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
|
||||||
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
|
||||||
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
|
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
|
||||||
|
ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
|
||||||
|
|
||||||
|
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
|
||||||
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
|
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
|
||||||
LINK_LIBRARIES(${COMPLEX_LIBS})
|
LINK_LIBRARIES(${COMPLEX_LIBS})
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user