diff options
| author |  Elvio Basello | 2008-04-04 20:49:45 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-04 20:49:45 +0000 |
| commit | 86d2d9e43f9415567b7504d77399f179a432231f (patch) | |
| tree | 750458d919ba47037eab8750ca23d7e331cb4cf4 /src | |
| parent | QT4 port of Q3Accel. (wip) (diff) | |
| download | KVIrc-86d2d9e43f9415567b7504d77399f179a432231f.tar.gz KVIrc-86d2d9e43f9415567b7504d77399f179a432231f.tar.bz2 KVIrc-86d2d9e43f9415567b7504d77399f179a432231f.zip | |
applied sardanap's patch to link modules under MacOS X;
added skel for modules under windows;
first try to install kvirc's shell scripts;
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1392 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
113 files changed, 928 insertions, 274 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 34a93a7ed..2cf93ac86 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -26,12 +26,15 @@ SET(kvilib_MOC_HDRS tal/kvi_tal_mainwindow_qt.h tal/kvi_tal_menubar.h tal/kvi_tal_scrollview.h + tal/kvi_tal_tabdialog.h tal/kvi_tal_toolbar_qt.h tal/kvi_tal_toolbardocktype.h tal/kvi_tal_tooltip.h + tal/kvi_tal_textedit.h tal/kvi_tal_vbox.h tal/kvi_tal_widgetstack.h tal/kvi_tal_windowstate.h + tal/kvi_tal_wizard.h system/kvi_byteorder.h system/kvi_env.h system/kvi_locale.h @@ -103,9 +106,9 @@ SET(kvilib_MOC_HDRS SET(kvilib_SRCS tal/kvi_tal_application.cpp tal/kvi_tal_filedialog.cpp - tal/kvi_tal_hbox.cpp tal/kvi_tal_grid.cpp tal/kvi_tal_groupbox.cpp + tal/kvi_tal_hbox.cpp tal/kvi_tal_iconview.cpp tal/kvi_tal_listbox.cpp tal/kvi_tal_listview.cpp @@ -113,10 +116,13 @@ SET(kvilib_SRCS tal/kvi_tal_menubar.cpp tal/kvi_tal_popupmenu.cpp tal/kvi_tal_scrollview.cpp + tal/kvi_tal_tabdialog.cpp + tal/kvi_tal_textedit.cpp tal/kvi_tal_toolbar.cpp tal/kvi_tal_tooltip.cpp tal/kvi_tal_vbox.cpp tal/kvi_tal_widgetstack.cpp + tal/kvi_tal_wizard.cpp system/kvi_env.cpp system/kvi_locale.cpp system/kvi_thread.cpp diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index f0a30d153..a00e693dc 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -431,20 +431,20 @@ SET(kvirc_SRCS QT4_WRAP_CPP(kvirc_MOC_SRCS ${kvirc_MOC_HDRS}) # Create bin -ADD_EXECUTABLE(${PACKAGE}-${VERSION_MAJOR} ${kvirc_SRCS} ${kvirc_MOC_SRCS}) +ADD_EXECUTABLE(${PACKAGE}${VERSION_MAJOR} ${kvirc_SRCS} ${kvirc_MOC_SRCS}) # Link libraries -TARGET_LINK_LIBRARIES(${PACKAGE}-${VERSION_MAJOR} kvilib ${LIBS}) +TARGET_LINK_LIBRARIES(${PACKAGE}${VERSION_MAJOR} kvilib ${LIBS}) # Installation directives IF(UNIX) IF(APPLE) - INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/Contents/MacOS) + INSTALL(TARGETS ${PACKAGE}${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/Contents/MacOS) ELSE() # Assume linux - INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/bin) + INSTALL(TARGETS ${PACKAGE}${VERSION_MAJOR} RUNTIME DESTINATION ${INSTALL_PREFIX}/bin) ENDIF() ELSE() # Windows - #INSTALL(TARGETS ${PACKAGE}-${VERSION_MAJOR} RUNTIME DESTINATION ???) + #INSTALL(TARGETS ${PACKAGE}${VERSION_MAJOR} RUNTIME DESTINATION ???) ENDIF() diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 91b830aee..21a533d52 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -21,15 +21,17 @@ INCLUDE_DIRECTORIES( SUBDIRS( about action actioneditor addon aliaseditor avatar - chan channelsjoin codetester config context + chan channelsjoin clock codetester config context dcc dialog editor eventeditor file filetransferwindow help http - ident + ident iograph lamerizer links list log logview mask math mediaplayer mircimport my + notifier objects + options popupeditor raweditor regchan reguser rijndael setup sharedfile sharedfileswindow snd socketspy spaste str system diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt index da0763340..4f0810c23 100644 --- a/src/modules/about/CMakeLists.txt +++ b/src/modules/about/CMakeLists.txt @@ -5,6 +5,7 @@ SET(kviabout_MOC_HDRS ) SET(kviabout_SRCS + aboutdialog.cpp libkviabout.cpp ) @@ -25,10 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviabout LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviabout kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviabout LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviabout LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviabout LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviabout LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() - diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 7d4d6c268..919c2a257 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -163,4 +163,7 @@ void KviAboutDialog::closeButtonPressed() delete this; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "aboutdialog.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/aboutdialog.h index 95ef968a4..f0c44f86d 100644 --- a/src/modules/about/aboutdialog.h +++ b/src/modules/about/aboutdialog.h @@ -23,7 +23,6 @@ // #include <kvi_tal_tabdialog.h> - class KviAboutDialog : public KviTalTabDialog { Q_OBJECT diff --git a/src/modules/action/CMakeLists.txt b/src/modules/action/CMakeLists.txt index 7a6d0b608..d65d3e4e1 100644 --- a/src/modules/action/CMakeLists.txt +++ b/src/modules/action/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviaction LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviaction kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviaction LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviaction LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviaction LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviaction LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt index 915465951..ddbcc7ed9 100644 --- a/src/modules/actioneditor/CMakeLists.txt +++ b/src/modules/actioneditor/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviactioneditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt index 81682ea57..ed9bf45e8 100644 --- a/src/modules/addon/CMakeLists.txt +++ b/src/modules/addon/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviaddon kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt index 1dd4487c0..8a5fe6fbc 100644 --- a/src/modules/aliaseditor/CMakeLists.txt +++ b/src/modules/aliaseditor/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvialiaseditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/avatar/CMakeLists.txt b/src/modules/avatar/CMakeLists.txt index e1bbdec16..c21e88fe3 100644 --- a/src/modules/avatar/CMakeLists.txt +++ b/src/modules/avatar/CMakeLists.txt @@ -25,9 +25,17 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviavatar kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/chan/CMakeLists.txt b/src/modules/chan/CMakeLists.txt index 168db1ee9..fbd716079 100644 --- a/src/modules/chan/CMakeLists.txt +++ b/src/modules/chan/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvichan LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvichan kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvichan LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvichan LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvichan LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvichan LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt index 07a26c235..839e17812 100644 --- a/src/modules/channelsjoin/CMakeLists.txt +++ b/src/modules/channelsjoin/CMakeLists.txt @@ -24,9 +24,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvichannelsjoin kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/clock/CMakeLists.txt b/src/modules/clock/CMakeLists.txt index 1410d3c40..d01115677 100644 --- a/src/modules/clock/CMakeLists.txt +++ b/src/modules/clock/CMakeLists.txt @@ -25,9 +25,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviclock LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviclock kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviclock LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviclock LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviclock LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviclock LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt index 45f1a9009..df0c78da4 100644 --- a/src/modules/codetester/CMakeLists.txt +++ b/src/modules/codetester/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvicodetester kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/config/CMakeLists.txt b/src/modules/config/CMakeLists.txt index dd6101c57..61ca8e2a4 100644 --- a/src/modules/config/CMakeLists.txt +++ b/src/modules/config/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviconfig kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/context/CMakeLists.txt b/src/modules/context/CMakeLists.txt index 638dcaa4b..e58273ce5 100644 --- a/src/modules/context/CMakeLists.txt +++ b/src/modules/context/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvicontext kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index 7313b8d96..ca7f0cf14 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -59,9 +59,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvidcc kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/dialog/CMakeLists.txt b/src/modules/dialog/CMakeLists.txt index a71bf1e13..88ae2ef8a 100644 --- a/src/modules/dialog/CMakeLists.txt +++ b/src/modules/dialog/CMakeLists.txt @@ -25,9 +25,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvidialog kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt index 73eac0b51..30f845ec4 100644 --- a/src/modules/editor/CMakeLists.txt +++ b/src/modules/editor/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvieditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt index 0a3299fe1..93d71a5bb 100644 --- a/src/modules/eventeditor/CMakeLists.txt +++ b/src/modules/eventeditor/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvieventeditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/file/CMakeLists.txt b/src/modules/file/CMakeLists.txt index 0ec3f192c..91443de0e 100644 --- a/src/modules/file/CMakeLists.txt +++ b/src/modules/file/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvifile LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvifile kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvifile LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvifile LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvifile LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvifile LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt index 65862ff13..c142cc792 100644 --- a/src/modules/filetransferwindow/CMakeLists.txt +++ b/src/modules/filetransferwindow/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvifiletransferwindow kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt index 1d22506f3..6544b6718 100644 --- a/src/modules/help/CMakeLists.txt +++ b/src/modules/help/CMakeLists.txt @@ -30,9 +30,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvihelp kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt index 74225932e..f34a30137 100644 --- a/src/modules/http/CMakeLists.txt +++ b/src/modules/http/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvihttp kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt index 5dff9de59..ec6fb74a1 100644 --- a/src/modules/ident/CMakeLists.txt +++ b/src/modules/ident/CMakeLists.txt @@ -29,9 +29,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviident LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviident kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviident LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviident LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviident LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviident LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt index 1b961f784..6752645fb 100644 --- a/src/modules/iograph/CMakeLists.txt +++ b/src/modules/iograph/CMakeLists.txt @@ -25,9 +25,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviiograph kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/lamerizer/CMakeLists.txt b/src/modules/lamerizer/CMakeLists.txt index 31c0cf207..9ed865178 100644 --- a/src/modules/lamerizer/CMakeLists.txt +++ b/src/modules/lamerizer/CMakeLists.txt @@ -25,9 +25,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvilamerizer kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt index 2e9dba630..867c60103 100644 --- a/src/modules/links/CMakeLists.txt +++ b/src/modules/links/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvilinks kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt index ac69e54ed..4691fb34d 100644 --- a/src/modules/list/CMakeLists.txt +++ b/src/modules/list/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvilist LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvilist kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvilist LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvilist LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvilist LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvilist LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/log/CMakeLists.txt b/src/modules/log/CMakeLists.txt index d476166a6..22b07ac59 100644 --- a/src/modules/log/CMakeLists.txt +++ b/src/modules/log/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvilog LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvilog kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvilog LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvilog LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvilog LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvilog LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt index 4f41221b3..ef813aa22 100644 --- a/src/modules/logview/CMakeLists.txt +++ b/src/modules/logview/CMakeLists.txt @@ -28,9 +28,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvilogview kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/mask/CMakeLists.txt b/src/modules/mask/CMakeLists.txt index 4387847b7..bb5819fc8 100644 --- a/src/modules/mask/CMakeLists.txt +++ b/src/modules/mask/CMakeLists.txt @@ -18,9 +18,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvimask LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvimask kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvimask LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvimask LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvimask LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvimask LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/math/CMakeLists.txt b/src/modules/math/CMakeLists.txt index 5a3dbddf5..e7357b123 100644 --- a/src/modules/math/CMakeLists.txt +++ b/src/modules/math/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvimath LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvimath kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvimath LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvimath LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvimath LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvimath LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt index e1b4e0b5d..822d8e2b4 100644 --- a/src/modules/mediaplayer/CMakeLists.txt +++ b/src/modules/mediaplayer/CMakeLists.txt @@ -42,9 +42,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvimediaplayer kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/mircimport/CMakeLists.txt b/src/modules/mircimport/CMakeLists.txt index 0884b5e42..811df2694 100644 --- a/src/modules/mircimport/CMakeLists.txt +++ b/src/modules/mircimport/CMakeLists.txt @@ -25,9 +25,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvimircimport kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt index f7f655d78..504c5c9e7 100644 --- a/src/modules/my/CMakeLists.txt +++ b/src/modules/my/CMakeLists.txt @@ -28,9 +28,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvimy LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvimy kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvimy LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvimy LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvimy LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvimy LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt index f479a6935..0e24a2ff9 100644 --- a/src/modules/notifier/CMakeLists.txt +++ b/src/modules/notifier/CMakeLists.txt @@ -37,9 +37,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvinotifier kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 0c05e23e0..f997d018b 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -1423,5 +1423,7 @@ void KviNotifierWindow::progressUpdate() QPainter p(this); m_pProgressBar->draw(&p); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_notifierwindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 937e4055a..4ef9b45c9 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -702,4 +702,7 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT } } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_notifierwindowtabs.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index b26542db5..ff83a98c6 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -114,9 +114,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviobjects kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt index ffcc19a2c..c6d4611e9 100644 --- a/src/modules/options/CMakeLists.txt +++ b/src/modules/options/CMakeLists.txt @@ -112,9 +112,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvioptions kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index ca1603afb..dd93509b1 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -120,4 +120,6 @@ void KviOptionsWidgetContainer::cancelClicked() deleteLater(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_container.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 87931b46e..7a5c21816 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -643,4 +643,6 @@ void KviOptionsDialog::keyPressEvent( QKeyEvent * e ) e->ignore(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_dialog.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index b5c7bb32f..2dd3e8db5 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -3586,5 +3586,7 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_instances.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 48fb565d7..95f4efc62 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -61,4 +61,6 @@ void KviAntispamOptionsWidget::reenableStuff(bool) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_antispam.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index fdfd5780b..c3dd5c8f3 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -128,4 +128,6 @@ KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_avatar.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index c23f5c651..3fc98b877 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -68,4 +68,6 @@ void KviAwayOptionsWidget::enableCustomAwayText(bool) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_away.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 769df05f8..784fa0748 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -318,4 +318,6 @@ KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_connection.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index 59d5e7da0..3100189d6 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -87,4 +87,6 @@ KviCtcpOptionsWidget::~KviCtcpOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ctcp.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 7e1b3a1bf..59880d4da 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -113,4 +113,6 @@ KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ctcpfloodprotection.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 2d3cbe16b..26514cd4c 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -390,4 +390,6 @@ KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_dcc.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp index 64b737659..d75ecaa67 100644 --- a/src/modules/options/optw_generalopt.cpp +++ b/src/modules/options/optw_generalopt.cpp @@ -48,4 +48,6 @@ KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_generalopt.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index aad2cd974..b494fe905 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -123,6 +123,8 @@ KviAlertOptionsWidget::~KviAlertOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_highlighting.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp index 5a393a695..647386517 100644 --- a/src/modules/options/optw_ident.cpp +++ b/src/modules/options/optw_ident.cpp @@ -34,4 +34,6 @@ +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ident.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 27186e455..e44f0110a 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -726,4 +726,6 @@ void KviIdentityAdvancedOptionsWidget::commit() +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_identity.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index e258926fd..03b6ab259 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -59,4 +59,6 @@ void KviIgnoreOptionsWidget::enableVerbose(bool) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ignore.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index f2a23d8fc..ec7e09ae2 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -153,4 +153,6 @@ KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_input.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 21db72aa2..7d308ba06 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -85,4 +85,6 @@ void KviInterfaceFeaturesOptionsWidget::commit() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_interfacefeatures.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index f09fc7a0d..3d7599e23 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -212,4 +212,6 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_interfacelookglobal.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 3572fe38b..467a8d23d 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -217,4 +217,6 @@ void KviChannelAdvancedOptionsWidget::commit() KviOptionsWidget::commit(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_irc.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index a7e565f1a..d3ec2fb3e 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -91,4 +91,6 @@ void KviIrcOutputOptionsWidget::commit() KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ircoutput.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp index 766a8c772..57e685f7d 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -165,4 +165,6 @@ KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget() +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ircview.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 34e3eb300..30b1ab0b3 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -82,4 +82,6 @@ KviLagOptionsWidget::~KviLagOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_lag.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index f8a197e82..8195c0af4 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -61,4 +61,6 @@ KviLoggingOptionsWidget::~KviLoggingOptionsWidget() +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_logging.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index 02bbc6342..cc0bae109 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -259,4 +259,6 @@ void KviMediaTypesOptionsWidget::commit() g_pMediaManager->unlock(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_mediatypes.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 2742d6dd8..bcbf911a3 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -690,4 +690,6 @@ void KviMessageColorsOptionsWidget::load() } } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_messages.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index efa7d2ef1..eca74f339 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -365,4 +365,6 @@ void KviNickServOptionsWidget::commit() KviOptionsWidget::commit(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_nickserv.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 23b4252b3..8e92d2a58 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -131,4 +131,6 @@ KviNotifierOptionsWidget::~KviNotifierOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_notify.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index 137ffbb8b..66c014ccc 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -47,4 +47,6 @@ KviProtectionOptionsWidget::~KviProtectionOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_protection.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index cd2f34304..5b64a2569 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -364,4 +364,6 @@ void KviProxyOptionsWidget::removeCurrent() } } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_proxy.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 19963c37f..86b6ac82f 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -112,4 +112,6 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_query.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index b6c121bae..cf806c504 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1709,4 +1709,6 @@ void KviServerOptionsWidget::detailsClicked() } } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_servers.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index dcd1f2e7e..56a409b9a 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -35,9 +35,11 @@ #include <qpushbutton.h> #include "kvi_tal_hbox.h" -#ifdef COMPILE_INFO_TIPS +#warning BIG FAT WARNING, i deleted the IFDEF to let this stuff compile on OSX +#warning PLEASE do a more portable FIX +//#ifdef COMPILE_INFO_TIPS #include "kvi_tal_tooltip.h" -#endif +//#endif // FIXME: This module doesn't Cancel properly when auto-detection is performed! @@ -307,4 +309,6 @@ KviSoundsOptionsWidget::~KviSoundsOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_sound.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 6242c3c4b..010f0ae9f 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -32,4 +32,6 @@ +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_ssl.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 89e16c005..32ecc6641 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -252,4 +252,6 @@ KviClassicTaskBarOptionsWidget::~KviClassicTaskBarOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_taskbar.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 067fe0a48..8181900b2 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -136,4 +136,6 @@ void KviTextEncodingOptionsWidget::commit() QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),QMessageBox::Ok);*/ } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_textencoding.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 8ff6a7ca1..4a85c5c20 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -241,4 +241,6 @@ void KviTextIconsOptionsWidget::commit() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_texticons.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_theme.cpp b/src/modules/options/optw_theme.cpp index 9906b7ec1..e558b6f77 100644 --- a/src/modules/options/optw_theme.cpp +++ b/src/modules/options/optw_theme.cpp @@ -22,5 +22,8 @@ // //============================================================================= +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_optw_theme.moc" +#warning this is a test +// #include "m_optw_theme.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index 1f927b2d3..855702925 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -47,4 +47,6 @@ KviToolsOptionsWidget::~KviToolsOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_tools.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index 67a5e635f..25382a2cd 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -40,4 +40,6 @@ KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_topiclabel.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp index 656debbbf..0b9a98da0 100644 --- a/src/modules/options/optw_transport.cpp +++ b/src/modules/options/optw_transport.cpp @@ -30,4 +30,6 @@ +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_transport.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 791048d23..5ecbc50ba 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -88,4 +88,6 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_tray.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp index 3afbbe578..263acacf1 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -59,4 +59,6 @@ KviUParserOptionsWidget::~KviUParserOptionsWidget() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_uparser.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 76060c028..88548f914 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -122,6 +122,8 @@ void KviUrlHandlersOptionsWidget::commit() #endif } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_urlhandlers.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif //_OPTW_URLHANDLERS_CPP_ diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index c16dac937..65807f78c 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -242,4 +242,6 @@ KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget() { } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_optw_userlist.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/perl/CMakeLists.txt b/src/modules/perl/CMakeLists.txt index 1eef815ca..b94595825 100644 --- a/src/modules/perl/CMakeLists.txt +++ b/src/modules/perl/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviperl LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviperl kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviperl LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviperl LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviperl LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviperl LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt index 7f118f3f0..dc87d7f37 100644 --- a/src/modules/perlcore/CMakeLists.txt +++ b/src/modules/perlcore/CMakeLists.txt @@ -45,9 +45,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviperlcore kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt index 1af00de1a..facf3a253 100644 --- a/src/modules/popupeditor/CMakeLists.txt +++ b/src/modules/popupeditor/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvipopupeditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt index 3a490e8f4..4c1adce7c 100644 --- a/src/modules/raweditor/CMakeLists.txt +++ b/src/modules/raweditor/CMakeLists.txt @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviraweditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/regchan/CMakeLists.txt b/src/modules/regchan/CMakeLists.txt index 260913541..6bf2b6f40 100644 --- a/src/modules/regchan/CMakeLists.txt +++ b/src/modules/regchan/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviregchan kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt index 326a7596a..9ccb333ba 100644 --- a/src/modules/reguser/CMakeLists.txt +++ b/src/modules/reguser/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/reguser -SET(kvieditor_MOC_HDRS +SET(kvireguser_MOC_HDRS edituser.h wizard.h dialog.h @@ -30,9 +30,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvireguser kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt index 6431c9df9..9acac3b1c 100644 --- a/src/modules/rijndael/CMakeLists.txt +++ b/src/modules/rijndael/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/rijndael -SET(kvieditor_MOC_HDRS +SET(kvirijndael__MOC_HDRS libkvirijndael.h rijndael.h ablowfish.h @@ -29,9 +29,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvirijndael kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt index 88408a735..377875a07 100644 --- a/src/modules/setup/CMakeLists.txt +++ b/src/modules/setup/CMakeLists.txt @@ -4,7 +4,7 @@ IF(WIN32) LIST(APPEND LIBS -lole32 -luuid) ENDIF() -SET(kvieditor_MOC_HDRS +SET(kvisetup_MOC_HDRS setupwizard.h ) @@ -30,9 +30,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvisetup kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h index 04e86f1cc..526292e21 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/setupwizard.h @@ -68,7 +68,7 @@ public: #define THEME_APPLY_HIRES 1 #define THEME_APPLY_LORES 2 -class KviSetupWizard : public KviTalWizard +class KviSetupWizard : public KviTalWizard { Q_OBJECT public: diff --git a/src/modules/sharedfile/CMakeLists.txt b/src/modules/sharedfile/CMakeLists.txt index fb74ea42b..381708d40 100644 --- a/src/modules/sharedfile/CMakeLists.txt +++ b/src/modules/sharedfile/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvisharedfile kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt index 62a69f3db..d2eaab0cb 100644 --- a/src/modules/sharedfileswindow/CMakeLists.txt +++ b/src/modules/sharedfileswindow/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/sharedfilewindow -SET(kvieditor_MOC_HDRS +SET(kvisharedfilewindow_MOC_HDRS sharedfileswindow.h ) @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvisharedfilewindow kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/snd/CMakeLists.txt b/src/modules/snd/CMakeLists.txt index 6ee441ee5..0964ef555 100644 --- a/src/modules/snd/CMakeLists.txt +++ b/src/modules/snd/CMakeLists.txt @@ -4,7 +4,7 @@ IF(WIN32) LIST(APPEND LIBS -lwinmm) ENDIF() -SET(kvieditor_MOC_HDRS +SET(kvisnd_MOC_HDRS libkvisnd.h ) @@ -29,9 +29,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvisnd kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt index 561d4c036..0ddcc6055 100644 --- a/src/modules/socketspy/CMakeLists.txt +++ b/src/modules/socketspy/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/socketspy -SET(kvieditor_MOC_HDRS +SET(kvisocketspy_MOC_HDRS socketspywindow.h ) @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvisocketspy kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt index 212fbfc93..d344dac35 100644 --- a/src/modules/spaste/CMakeLists.txt +++ b/src/modules/spaste/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/spaste -SET(kvieventeditor_MOC_HDRS +SET(kvispaste_MOC_HDRS controller.h libkvispaste.h ) @@ -27,9 +27,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvispaste kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt index 41f0ae454..a75a6a115 100644 --- a/src/modules/str/CMakeLists.txt +++ b/src/modules/str/CMakeLists.txt @@ -30,9 +30,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvistr LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvistr kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvistr LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvistr LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvistr LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvistr LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt index 4fbaa7d08..f95ee6797 100644 --- a/src/modules/system/CMakeLists.txt +++ b/src/modules/system/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/system -SET(kvieventeditor_MOC_HDRS +SET(kvisystem_MOC_HDRS plugin.h ) @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvisystem kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt index c8a707de4..6148f4844 100644 --- a/src/modules/term/CMakeLists.txt +++ b/src/modules/term/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/term -SET(kvieventeditor_MOC_HDRS +SET(kviterm_MOC_HDRS termwidget.h termwindow.h ) @@ -28,9 +28,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviterm LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviterm kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviterm LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviterm LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviterm LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviterm LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/texticons/CMakeLists.txt b/src/modules/texticons/CMakeLists.txt index 1ffed6a23..fee39c187 100644 --- a/src/modules/texticons/CMakeLists.txt +++ b/src/modules/texticons/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitexticons kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt index 6d47d61f3..65ff5fcf3 100644 --- a/src/modules/theme/CMakeLists.txt +++ b/src/modules/theme/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/theme -SET(kvieventeditor_MOC_HDRS +SET(kvitheme_MOC_HDRS managementdialog.h packthemedialog.h savethemedialog.h @@ -32,9 +32,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitheme kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt index b3cbd42ea..10e1f3a6e 100644 --- a/src/modules/tip/CMakeLists.txt +++ b/src/modules/tip/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/tip -SET(kvieventeditor_MOC_HDRS +SET(kvitip_MOC_HDRS libkvitip.h ) @@ -25,9 +25,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitip LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitip kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitip LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitip LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitip LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitip LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/tmphighlight/CMakeLists.txt b/src/modules/tmphighlight/CMakeLists.txt index 6d1d03e92..94c0aba71 100644 --- a/src/modules/tmphighlight/CMakeLists.txt +++ b/src/modules/tmphighlight/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitmphighlight kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/toolbar/CMakeLists.txt b/src/modules/toolbar/CMakeLists.txt index 2194d2751..d2aaeb5ca 100644 --- a/src/modules/toolbar/CMakeLists.txt +++ b/src/modules/toolbar/CMakeLists.txt @@ -21,9 +21,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitoolbar kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt index c058009ed..1ea87b0cb 100644 --- a/src/modules/toolbareditor/CMakeLists.txt +++ b/src/modules/toolbareditor/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/toolbareditor -SET(kvieventeditor_MOC_HDRS +SET(kvitoolbareditor_MOC_HDRS toolbareditor.h ) @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitoolbareditor kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt index 96a935624..5db0da5c6 100644 --- a/src/modules/torrent/CMakeLists.txt +++ b/src/modules/torrent/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/torrent -SET(kvieventeditor_MOC_HDRS +SET(kvitorrent_MOC_HDRS tc_statusbarapplet.h tc_ktorrentdcopinterface.h tc_interface.h @@ -30,9 +30,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitorrent kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt index 7fef90b9d..72592e436 100644 --- a/src/modules/trayicon/CMakeLists.txt +++ b/src/modules/trayicon/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/trayicon -SET(kvieventeditor_MOC_HDRS +SET(kvitrayicon_MOC_HDRS libkvitrayicon.h trayicon.h ) @@ -30,9 +30,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kvitrayicon kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt index ccd7e07f5..623c5697f 100644 --- a/src/modules/url/CMakeLists.txt +++ b/src/modules/url/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/url -SET(kvieventeditor_MOC_HDRS +SET(kviurl_MOC_HDRS libkviurl.h icons.h ) @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviurl LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviurl kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviurl LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviurl LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviurl LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviurl LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt index 476289e4e..2407943eb 100644 --- a/src/modules/window/CMakeLists.txt +++ b/src/modules/window/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/window -SET(kvieventeditor_MOC_HDRS +SET(kviwindow_MOC_HDRS userwindow.h ) @@ -26,9 +26,18 @@ ELSE() ENDIF() # Install target -SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) -IF(APPLE) - INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) +IF(UNIX) + IF(APPLE) + TARGET_LINK_LIBRARIES(kviwindow kvilib ${LIBS}) + SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} INSTALL_NAME_DIR @executable_path/../Frameworks) + INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/) + ELSE() + # Assume linux + SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + ENDIF() ELSE() - INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/) + # Windows + SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) + #INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/) ENDIF() |