aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options
diff options
context:
space:
mode:
authorGravatar Elvio Basello2008-04-11 14:53:51 +0000
committerGravatar Elvio Basello2008-04-11 14:53:51 +0000
commitff2399cc34ec4e8189b246894a2e4a3dea838015 (patch)
tree4fab5117ea08a81d3156d332122be715f10f7dfe /src/modules/options
parentTextIcon table view fixes (diff)
downloadKVIrc-ff2399cc34ec4e8189b246894a2e4a3dea838015.tar.gz
KVIrc-ff2399cc34ec4e8189b246894a2e4a3dea838015.tar.bz2
KVIrc-ff2399cc34ec4e8189b246894a2e4a3dea838015.zip
added template rules for modules. thanks to sardanap;
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1456 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/CMakeLists.txt30
-rw-r--r--src/modules/options/optw_texticons.cpp1
2 files changed, 2 insertions, 29 deletions
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index 0a23d8897..f87c2d51e 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -90,31 +90,5 @@ SET(kvioptions_SRCS
# After this call, files will be moc'ed to moc_kvi_*.cpp
QT4_WRAP_CPP(kvioptions_MOC_SRCS ${kvioptions_MOC_HDRS})
-# Create library
-IF(UNIX)
- IF(APPLE)
- ADD_LIBRARY(kvioptions MODULE ${kvioptions_SRCS} ${kvioptions_MOC_SRCS})
- ELSE()
- # Assume linux
- ADD_LIBRARY(kvioptions SHARED ${kvioptions_SRCS} ${kvioptions_MOC_SRCS})
- ENDIF()
-ELSE()
- # Assume windows
- #ADD_LIBRARY(kvioptions ???)
-ENDIF()
-
-# Install target
-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()
-ELSEIF(WIN32)
- SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR})
- #INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/)
-ENDIF()
+SET(kvi_module_name kvioptions)
+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 9487b5279..bf9b7aa27 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -261,7 +261,6 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
m_pDel->setEnabled(false);
- // FIXME: this does not work
connect(m_pTable,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged()));
}