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/modules/setup | |
| 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/modules/setup')
| -rw-r--r-- | src/modules/setup/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/modules/setup/setupwizard.h | 2 |
2 files changed, 15 insertions, 6 deletions
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: |