From 467dccc8a579412b45bbbb5f9ffd4d6ef53aceaf Mon Sep 17 00:00:00 2001 From: Robert Förster Date: Fri, 28 Sep 2012 14:17:22 +0000 Subject: - move the stripping of /RTC1 to perlcore, as MSVC doesn't seem to care if it needs to link against mixed modules and perl seems to only module not wanting run-time error checks (perl does braindead things anyway; i have no debug python to test here) - "fix" msvc build with perl disabled (note the todo in kvilibs CMakeLists.txt hint: its a bleeping hack, kthxbye) - kill duplicate KVIRC_BINARYNAME from module.rules.txt - bump version in resources_win32/version.h - some svn:eol-style crap (i wonder if i ever finish that up) NB: try to beat some sanity into perl, since it does add tons of crap to the cmdline (it was actually the one adding -ltcg); which we need some of at some point in the build but it really shouldn't be done unconditionally. git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6256 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/perlcore/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/modules') diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt index e22b7bc69..6ccfe4bbf 100644 --- a/src/modules/perlcore/CMakeLists.txt +++ b/src/modules/perlcore/CMakeLists.txt @@ -23,5 +23,12 @@ ENDIF() INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) IF(COMPILE_PERL_SUPPORT) + IF(WANT_DEBUG AND MSVC) + # Activestates Perl does not support Run-Time Error checks + STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) + STRING(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG_INIT ${CMAKE_C_FLAGS_DEBUG_INIT}) + STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + STRING(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + ENDIF() SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) ENDIF() \ No newline at end of file -- cgit v1.3.1-10-gc9f91