diff options
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | cmake/module.rules.txt | 2 | ||||
| -rw-r--r-- | data/resources_win32/version.h | 8 | ||||
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/modules/perlcore/CMakeLists.txt | 7 |
5 files changed, 18 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 11e0b58ba..cdeacb243 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,6 @@ ELSEIF(WIN32) ENDIF() LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) - ############################################################################### # # Release type @@ -189,7 +188,7 @@ ELSE() SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) SET(CMAKE_STATUS_DEBUG_SUPPORT "Yes") IF(CMAKE_COMPILER_IS_GNUCXX) - #force gdb format of debug symbols + # force gdb format of debug symbols SET(CMAKE_CXX_FLAGS "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") SET(CMAKE_C_FLAGS "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") INCLUDE(CheckCXXCompilerFlag) @@ -208,12 +207,7 @@ ELSE() ENDIF() ELSE() IF(MSVC) - #CMake default options are conflicting for some modules, such as perl - 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}) - #this is the equivalent of -O0 -g according to MSDN, /Zc:wchar_t- is default for QT 4.x but not 5; reevaluate then. + # this is the equivalent of -O0 -g according to MSDN, /Zc:wchar_t- is default for QT 4.x but not 5; reevaluate then. SET(CMAKE_CXX_FLAGS "/Od /Zi /Zc:wchar_t-") SET(CMAKE_C_FLAGS "/Od /Zi /Zc:wchar_t-") ELSE() @@ -236,7 +230,6 @@ ELSE() SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) - #force gdb options SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") INCLUDE(CheckCXXCompilerFlag) @@ -248,7 +241,7 @@ ELSE() ENDIF() ELSE() IF(MSVC) - #/Ox is -O3, /Zc:wchar_t- is default for QT 4.x but not 5; reevaluate then. + # /Ox is -O3, /Zc:wchar_t- is default for QT 4.x but not 5; reevaluate then. SET(CMAKE_CXX_FLAGS "/Ox /Zc:wchar_t-") SET(CMAKE_C_FLAGS "/Ox /Zc:wchar_t-") ELSE() diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index d00dd95e7..b5a7281ec 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -21,7 +21,7 @@ ENDFOREACH(LIB ${LIBS}) IF(WIN32) - TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${KVIRC_BINARYNAME} ${MODULE_LIBS}) + TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${MODULE_LIBS}) ELSE() TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${MODULE_LIBS}) ENDIF() diff --git a/data/resources_win32/version.h b/data/resources_win32/version.h index 59ae2479f..a630ac825 100644 --- a/data/resources_win32/version.h +++ b/data/resources_win32/version.h @@ -30,11 +30,11 @@ #define IDD_ICON4 103 #define IDD_ICON5 104 -#define VER_FILEVERSION 4,2,0,0 -#define VER_FILEVERSION_STR "4.2.0.0\0" +#define VER_FILEVERSION 4,3,0,0 +#define VER_FILEVERSION_STR "4.3.0.0\0" -#define VER_PRODUCTVERSION 4,2,0,0 -#define VER_PRODUCTVERSION_STR "4.2\0" +#define VER_PRODUCTVERSION 4,3,0,0 +#define VER_PRODUCTVERSION_STR "4.3\0" #define VER_COMPANYNAME_STR "KVIrc Development Team" #define VER_FILEDESCRIPTION_STR "KVIrc" diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 517bd9666..589d7a7f8 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -173,7 +173,9 @@ IF(WIN32) ENDIF() IF(MSVC) - LIST(APPEND LIBS wsock32.lib ws2_32.lib) + # THIS IS A DIRTY HACK: add winmm.lib for kvisnd. (maybe also needed for mingw?) perl does add a bunch of crap unconditionally, including winmm + # TODO: fix it properly at some point: APPEND LIBS does not seem to work at all for modules(?) + LIST(APPEND LIBS wsock32.lib ws2_32.lib winmm.lib) ENDIF() ADD_LIBRARY(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS}) 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 |