diff options
| author |  Elvio Basello | 2008-06-24 16:32:03 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-06-24 16:32:03 +0000 |
| commit | 05bb6c89b83fad24382ea54a3a770e1f9de644fa (patch) | |
| tree | 07a71e0ff0889894a1e445c219c5c3e7800f6b86 | |
| parent | Fixes for win32 msvc build (now it works ok, but SLOW AS HELL: kvirc+kvilib w... (diff) | |
| download | KVIrc-05bb6c89b83fad24382ea54a3a770e1f9de644fa.tar.gz KVIrc-05bb6c89b83fad24382ea54a3a770e1f9de644fa.tar.bz2 KVIrc-05bb6c89b83fad24382ea54a3a770e1f9de644fa.zip | |
enabled cmake info on about module. test it with msvc
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1935 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | cmake/module.rules.txt | 10 | ||||
| -rw-r--r-- | src/kvilib/config/kvi_settings.h | 6 | ||||
| -rw-r--r-- | src/kvirc/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/modules/about/aboutdialog.cpp | 4 | ||||
| -rw-r--r-- | src/modules/about/libkviabout.cpp | 2 |
5 files changed, 18 insertions, 20 deletions
diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index aaba7bd6b..c3e1f7b6c 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -10,12 +10,12 @@ ENDIF() ADD_LIBRARY(${kvi_module_name} MODULE ${${kvi_module_name}_SRCS} ${${kvi_module_name}_MOC_SRCS}) IF(WIN32) - IF(MINGW) - SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc") - ENDIF() - TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${LIBS}) + IF(MINGW) + SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc") + ENDIF() + TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${LIBS}) ELSE() - TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${LIBS}) + TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${LIBS}) ENDIF() IF(UNIX) diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index b9893b355..b448a042f 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -35,9 +35,9 @@ #include <QtGlobal> #ifdef KVIRC_EXTERNAL_MODULE - // when compiling an external module - // include the last configuration - #include "kvi_configstatus.h" + // when compiling an external module + // include the last configuration + #include "kvi_configstatus.h" #else // assume CMake build system for all systems #include "kvi_sysconfig.h" diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 4aeb5bcbe..23aee6be3 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -454,22 +454,22 @@ ENDIF() TARGET_LINK_LIBRARIES(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS}) IF(MINGW) - # needed for linking - SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc" ENABLE_EXPORTS ON) + # Needed for linking + SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc" ENABLE_EXPORTS ON) ENDIF() IF(MSVC) - # needed for linking + # Needed for linking SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES ENABLE_EXPORTS ON) ENDIF() IF(WIN32) - #we need this defined when mingw will compile moc files - ADD_DEFINITIONS(-D__KVIRC__) - ADD_DEFINITIONS(-DCOMPILE_USE_STANDALONE_MOC_SOURCES) - LIST(APPEND LIBS "shlwapi") + # We need this defined when mingw will compile moc files + ADD_DEFINITIONS(-D__KVIRC__) + ADD_DEFINITIONS(-DCOMPILE_USE_STANDALONE_MOC_SOURCES) + LIST(APPEND LIBS "shlwapi") ENDIF() - + # Installation directives IF(UNIX) diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index b10702173..a3f92235b 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -140,8 +140,6 @@ KviAboutDialog::KviAboutDialog() infoString += "<b>"; infoString += __tr2qs_ctx("Build Info","about"); infoString += ":</b><br>"; -// FIXME: Remove this line when win32 compiles using CMake -#ifndef COMPILE_ON_WINDOWS infoString += __tr2qs_ctx("Build Date","about"); infoString += ": "; infoString += KviBuildInfo::buildDate(); @@ -178,7 +176,7 @@ KviAboutDialog::KviAboutDialog() infoString += __tr2qs_ctx("Compiler Flags","about"); infoString += ": "; infoString += KviBuildInfo::buildCompilerFlags(); -#endif + v->setText(infoString); addTab(w,__tr2qs_ctx("Executable Informations","about")); diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp index ac05d33e3..a6bbcd14c 100644 --- a/src/modules/about/libkviabout.cpp +++ b/src/modules/about/libkviabout.cpp @@ -91,7 +91,7 @@ KVIRC_MODULE( "4.0.0", "Till Bush <buti@geocities.com>\n" \ "Szymon Stefanek <pragma at kvirc dot net>" \ - "Elvio Basello <hellvis69 at netsons dot org", + "Elvio Basello <hellvis69 at netsons dot org>", "Exports the /about.kvirc command\n", about_module_init , about_module_can_unload, |