From cf37a836a9344b946f8aa445776ec303b5d09382 Mon Sep 17 00:00:00 2001 From: Philippe Hamelin Date: Fri, 15 Apr 2011 15:07:30 -0400 Subject: [PATCH] win32: fix debug build. Added postfix 'd' to DLL name in debug mode to make debug and release modes coexist. Deleted the ignore msvcrt to repair linking in debug mode. --- CMakeLists.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3439b0b..d84776b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,8 @@ INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/. ) SET(LOG4CPP_CFLAGS) SET(LOG4CPP_LIBS) +SET (CMAKE_DEBUG_POSTFIX "d") + IF (WIN32) LIST(APPEND LOG4CPP_CFLAGS -D_CRT_SECURE_NO_WARNINGS -DLOG4CPP_HAS_DLL -DLOG4CPP_BUILD_DLL ) ELSE (WIN32) @@ -86,7 +88,7 @@ ADD_LIBRARY ( ${LOG4CPP_LIBRARY_NAME} SHARED IF (WIN32) TARGET_LINK_LIBRARIES (${LOG4CPP_LIBRARY_NAME} kernel32 user32 ws2_32 advapi32 ) - SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt) +# SET_TARGET_PROPERTIES(${LOG4CPP_LIBRARY_NAME} PROPERTIES LINK_FLAGS /NODEFAULTLIB:msvcrt) ENDIF (WIN32) # Note: this so-version is required by OCL, such that it can distinguish 'regular' log4cpp -- 1.7.0.4