From 26e05fc060810bd6dbf65e4a34992409244a2f8a Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 13 Nov 2002 20:11:26 -0500 Subject: fix shared builds on borland and add debug stuff for makefiles --- Modules/Platform/Windows-bcc32.cmake | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Modules/Platform/Windows-bcc32.cmake b/Modules/Platform/Windows-bcc32.cmake index 363f5e1..4ccd790 100644 --- a/Modules/Platform/Windows-bcc32.cmake +++ b/Modules/Platform/Windows-bcc32.cmake @@ -1,19 +1,25 @@ SET(CMAKE_LIBRARY_PATH_FLAG "-L") SET(CMAKE_LINK_LIBRARY_FLAG "") -SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-tWR") - +SET(CMAKE_SHARED_BUILD_CXX_FLAGS "-tWR") + +SET(CMAKE_START_TEMP_FILE "@&&|\n") +SET(CMAKE_END_TEMP_FILE "\n|") +# uncomment these out to debug makefiles +#SET(CMAKE_START_TEMP_FILE "") +#SET(CMAKE_END_TEMP_FILE "") +#SET(CMAKE_VERBOSE_MAKEFILE 1) # create a shared C++ library SET(CMAKE_CXX_CREATE_SHARED_LIBRARY - " @&&|\n-e -tWD -tWR \n|" - "implib @&&|\n-w .lib .dll\n|" + " ${CMAKE_START_TEMP_FILE}-e -tWD -tWR ${CMAKE_END_TEMP_FILE}" + "implib ${CMAKE_START_TEMP_FILE}-w .lib .dll${CMAKE_END_TEMP_FILE}" ) SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) # create a C shared library SET(CMAKE_C_CREATE_SHARED_LIBRARY - " @&&|\n-e -tWD \n|" - "implib @&&|\n-w .lib .dll\n|" + " ${CMAKE_START_TEMP_FILE}-e -tWD ${CMAKE_END_TEMP_FILE}" + "implib ${CMAKE_START_TEMP_FILE}-w .lib .dll${CMAKE_END_TEMP_FILE}" ) # create a C shared module just copy the shared library rule @@ -21,26 +27,26 @@ SET(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY}) # create a C++ static library -SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "tlib @&&|\n/p512 /a \n|") +SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "tlib ${CMAKE_START_TEMP_FILE}/p512 /a ${CMAKE_END_TEMP_FILE}") # create a C static library SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY}) # compile a C++ file into an object file SET(CMAKE_CXX_COMPILE_OBJECT - " @&&|\n-DWIN32 -P -o -c \n|") + " ${CMAKE_START_TEMP_FILE}-DWIN32 -P -o -c ${CMAKE_END_TEMP_FILE}") # compile a C file into an object file SET(CMAKE_C_COMPILE_OBJECT - " @&&|\n-DWIN32 -o -c \n|") + " ${CMAKE_START_TEMP_FILE}-DWIN32 -o -c ${CMAKE_END_TEMP_FILE}") SET(CMAKE_C_LINK_EXECUTABLE - " @&&|\n-e \n|") + " &&|\n-e ${CMAKE_END_TEMP_FILE}") SET(CMAKE_CXX_LINK_EXECUTABLE - " @&&|\n -e \n|") + " ${CMAKE_START_TEMP_FILE} -e ${CMAKE_END_TEMP_FILE}") SET (CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel.") -- cgit v0.12