diff options
| author | 2008-05-11 02:30:19 +0000 | |
|---|---|---|
| committer | 2008-05-11 02:30:19 +0000 | |
| commit | 07096a364af5c098303064c4c7b5927bd9d41c37 (patch) | |
| tree | 0248375b6a862d211746dc638724f031cbd926b5 /src/modules | |
| parent | re-activated language module and started implementing its functions (diff) | |
| download | KVIrc-07096a364af5c098303064c4c7b5927bd9d41c37.tar.gz KVIrc-07096a364af5c098303064c4c7b5927bd9d41c37.tar.bz2 KVIrc-07096a364af5c098303064c4c7b5927bd9d41c37.zip | |
Use CMAKE_INSTALL_PREFIX instead of INSTALL_PREFIX. Also hopefully fix out of source builds.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1744 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/filetransferwindow/caps/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/logview/caps/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/mircimport/caps/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/mircimport/pics/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/notifier/pics/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/rijndael/caps/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/sharedfileswindow/caps/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/snd/libkvisnd.cpp | 4 | ||||
| -rw-r--r-- | src/modules/tip/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/trayicon/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/url/caps/CMakeLists.txt | 6 |
11 files changed, 32 insertions, 32 deletions
diff --git a/src/modules/filetransferwindow/caps/CMakeLists.txt b/src/modules/filetransferwindow/caps/CMakeLists.txt index 962656264..5b4998926 100644 --- a/src/modules/filetransferwindow/caps/CMakeLists.txt +++ b/src/modules/filetransferwindow/caps/CMakeLists.txt @@ -4,11 +4,11 @@ SET(CAPSFILE filetransferwindow) IF(UNIX) IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) ELSE() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/) ENDIF() diff --git a/src/modules/logview/caps/CMakeLists.txt b/src/modules/logview/caps/CMakeLists.txt index 80a25794e..41088ecc0 100644 --- a/src/modules/logview/caps/CMakeLists.txt +++ b/src/modules/logview/caps/CMakeLists.txt @@ -4,11 +4,11 @@ SET(CAPSFILE logview) IF(UNIX) IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) ELSE() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/) ENDIF() diff --git a/src/modules/mircimport/caps/CMakeLists.txt b/src/modules/mircimport/caps/CMakeLists.txt index df6bc92c3..279d37757 100644 --- a/src/modules/mircimport/caps/CMakeLists.txt +++ b/src/modules/mircimport/caps/CMakeLists.txt @@ -4,11 +4,11 @@ SET(CAPSFILE mircimport) IF(UNIX) IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/caps/serverimport/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/serverimport/) ELSE() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/serverimport/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/serverimport/) ENDIF() diff --git a/src/modules/mircimport/pics/CMakeLists.txt b/src/modules/mircimport/pics/CMakeLists.txt index 0c4efc796..155782d40 100644 --- a/src/modules/mircimport/pics/CMakeLists.txt +++ b/src/modules/mircimport/pics/CMakeLists.txt @@ -4,11 +4,11 @@ SET(PICSFILE kvi_mircimport.png) IF(UNIX) IF(APPLE) - INSTALL(FILES ${PICSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/) + INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) ELSE() # Assume linux - INSTALL(FILES ${PICSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) ENDIF() diff --git a/src/modules/notifier/pics/CMakeLists.txt b/src/modules/notifier/pics/CMakeLists.txt index 32b77ee2d..433adef8f 100644 --- a/src/modules/notifier/pics/CMakeLists.txt +++ b/src/modules/notifier/pics/CMakeLists.txt @@ -4,11 +4,11 @@ FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") IF(UNIX) IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/) + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) ELSE() # Assume linux - INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${files} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) + #INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) ENDIF() diff --git a/src/modules/rijndael/caps/CMakeLists.txt b/src/modules/rijndael/caps/CMakeLists.txt index a0ce55407..0042dbc55 100644 --- a/src/modules/rijndael/caps/CMakeLists.txt +++ b/src/modules/rijndael/caps/CMakeLists.txt @@ -4,11 +4,11 @@ SET(CAPSFILE rijndael) IF(UNIX) IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) ELSE() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/crypt/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/crypt/) ENDIF() diff --git a/src/modules/sharedfileswindow/caps/CMakeLists.txt b/src/modules/sharedfileswindow/caps/CMakeLists.txt index 6b2715fe5..a647b170e 100644 --- a/src/modules/sharedfileswindow/caps/CMakeLists.txt +++ b/src/modules/sharedfileswindow/caps/CMakeLists.txt @@ -4,11 +4,11 @@ SET(CAPSFILE sharedfileswindow) IF(UNIX) IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) ELSE() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/) ENDIF() diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index c38673a15..482af087c 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -42,9 +42,9 @@ #include <Phonon/Path> #include <Phonon/Global> #else //!COMPILE_KDE_SUPPORT - #include <Phonon> + #include <phonon> #endif //!COMPILE_KDE_SUPPORT -Phonon::MediaObject * g_pPhononPlayer=0; + Phonon::MediaObject * g_pPhononPlayer=0; #endif //!COMPILE_PHONON_SUPPORT #ifdef COMPILE_ON_WINDOWS diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt index f9cf3ae2d..bbd81f9a3 100644 --- a/src/modules/tip/CMakeLists.txt +++ b/src/modules/tip/CMakeLists.txt @@ -19,11 +19,11 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) # Install rule IF(UNIX) IF(APPLE) - INSTALL(FILES ${tips} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/config/modules/) + INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/modules/) ELSE() # Assume linux - INSTALL(FILES ${tips} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/) + INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${tips} DESTINATION ${INSTALL_PREFIX}/ ??? /config/modules/) + #INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /config/modules/) ENDIF()
\ No newline at end of file diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt index c0434d2c0..2c23a60ab 100644 --- a/src/modules/trayicon/CMakeLists.txt +++ b/src/modules/trayicon/CMakeLists.txt @@ -32,11 +32,11 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) IF(UNIX) IF(APPLE) - INSTALL(FILES ${unixFiles} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/pics/) + INSTALL(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) ELSE() # Assume linux - INSTALL(FILES ${unixFiles} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + INSTALL(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${win32Files} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) + #INSTALL(FILES ${win32Files} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/) ENDIF()
\ No newline at end of file diff --git a/src/modules/url/caps/CMakeLists.txt b/src/modules/url/caps/CMakeLists.txt index 247915610..6334d46d1 100644 --- a/src/modules/url/caps/CMakeLists.txt +++ b/src/modules/url/caps/CMakeLists.txt @@ -4,11 +4,11 @@ SET(CAPSFILE url) IF(UNIX) IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/Contents/Resources/modules/caps/action/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/action/) ELSE() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/action/) + INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/action/) ENDIF() ELSEIF(WIN32) - #INSTALL(FILES ${CAPSFILE} DESTINATION ${INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/action/) + #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/action/) ENDIF() |
