aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/helppics/CMakeLists.txt3
-rw-r--r--data/mimelnk/CMakeLists.txt1
-rw-r--r--doc/scriptexamples/CMakeLists.txt2
-rw-r--r--doc/scriptexamples/kvisounds/CMakeLists.txt2
-rw-r--r--doc/scriptexamples/kvisounds/waves/CMakeLists.txt2
-rw-r--r--doc/scriptexamples/mp3share/CMakeLists.txt2
-rw-r--r--doc/scriptexamples/playing/CMakeLists.txt2
-rw-r--r--doc/scriptexamples/tutorial/CMakeLists.txt2
-rw-r--r--src/modules/filetransferwindow/caps/CMakeLists.txt4
-rw-r--r--src/modules/logview/caps/CMakeLists.txt2
-rw-r--r--src/modules/mircimport/caps/CMakeLists.txt2
-rw-r--r--src/modules/mircimport/pics/CMakeLists.txt4
-rw-r--r--src/modules/notifier/pics/CMakeLists.txt2
-rw-r--r--src/modules/rijndael/caps/CMakeLists.txt2
-rw-r--r--src/modules/sharedfileswindow/caps/CMakeLists.txt2
-rw-r--r--src/modules/tip/CMakeLists.txt2
-rw-r--r--src/modules/url/caps/CMakeLists.txt2
17 files changed, 18 insertions, 20 deletions
diff --git a/data/helppics/CMakeLists.txt b/data/helppics/CMakeLists.txt
index 2fcbcfd10..0989a5217 100644
--- a/data/helppics/CMakeLists.txt
+++ b/data/helppics/CMakeLists.txt
@@ -4,8 +4,7 @@ FILE(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
IF(UNIX)
IF(APPLE)
- # FIXME correct path ?
- #INSTALL(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/)
+ INSTALL(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/help/en/)
ELSE()
# Assume linux
INSTALL(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help/en/)
diff --git a/data/mimelnk/CMakeLists.txt b/data/mimelnk/CMakeLists.txt
index 40e164cc4..aa0b888ab 100644
--- a/data/mimelnk/CMakeLists.txt
+++ b/data/mimelnk/CMakeLists.txt
@@ -1,6 +1,5 @@
# CMakeLists for data/mimelnk
IF(UNIX AND NOT APPLE)
- #INSTALL(FILES kvirc4.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/applications/)
INSTALL(FILES x-kva.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/applications/)
INSTALL(FILES x-kvt.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/applications/)
INSTALL(FILES x-kvc.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mimelnk/text/)
diff --git a/doc/scriptexamples/CMakeLists.txt b/doc/scriptexamples/CMakeLists.txt
index 18e4e1c8e..77897b167 100644
--- a/doc/scriptexamples/CMakeLists.txt
+++ b/doc/scriptexamples/CMakeLists.txt
@@ -27,5 +27,5 @@ IF(UNIX)
INSTALL(FILES ${scriptexamples} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/scriptexamples)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${scriptexamples} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/doc/scriptexamples)
+ INSTALL(FILES ${scriptexamples} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/scriptexamples)
ENDIF()
diff --git a/doc/scriptexamples/kvisounds/CMakeLists.txt b/doc/scriptexamples/kvisounds/CMakeLists.txt
index de741de63..97d7d2870 100644
--- a/doc/scriptexamples/kvisounds/CMakeLists.txt
+++ b/doc/scriptexamples/kvisounds/CMakeLists.txt
@@ -12,5 +12,5 @@ IF(UNIX)
INSTALL(FILES ${kvisounds} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/scriptexamples/kvisounds)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${kvisounds} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/doc/scriptexamples/kvisounds)
+ INSTALL(FILES ${kvisounds} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/scriptexamples/kvisounds)
ENDIF()
diff --git a/doc/scriptexamples/kvisounds/waves/CMakeLists.txt b/doc/scriptexamples/kvisounds/waves/CMakeLists.txt
index 4f07084bd..c55f1ee6f 100644
--- a/doc/scriptexamples/kvisounds/waves/CMakeLists.txt
+++ b/doc/scriptexamples/kvisounds/waves/CMakeLists.txt
@@ -22,5 +22,5 @@ IF(UNIX)
INSTALL(FILES ${waves} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/scriptexamples/kvisounds/waves)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${waves} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/doc/scriptexamples/kvisounds/waves)
+ INSTALL(FILES ${waves} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/scriptexamples/kvisounds/waves)
ENDIF()
diff --git a/doc/scriptexamples/mp3share/CMakeLists.txt b/doc/scriptexamples/mp3share/CMakeLists.txt
index c4ad5bf3d..b38e3769c 100644
--- a/doc/scriptexamples/mp3share/CMakeLists.txt
+++ b/doc/scriptexamples/mp3share/CMakeLists.txt
@@ -14,5 +14,5 @@ IF(UNIX)
INSTALL(FILES ${mp3share} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/scriptexamples/mp3share)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${mp3share} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/doc/scriptexamples/mp3share)
+ INSTALL(FILES ${mp3share} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/scriptexamples/mp3share)
ENDIF()
diff --git a/doc/scriptexamples/playing/CMakeLists.txt b/doc/scriptexamples/playing/CMakeLists.txt
index cb1a1ac86..30d7281d7 100644
--- a/doc/scriptexamples/playing/CMakeLists.txt
+++ b/doc/scriptexamples/playing/CMakeLists.txt
@@ -14,5 +14,5 @@ IF(UNIX)
INSTALL(FILES ${playing} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/scriptexamples/playing)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${playing} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/doc/scriptexamples/playing)
+ INSTALL(FILES ${playing} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/scriptexamples/playing)
ENDIF()
diff --git a/doc/scriptexamples/tutorial/CMakeLists.txt b/doc/scriptexamples/tutorial/CMakeLists.txt
index 24d3df362..5236ebbc2 100644
--- a/doc/scriptexamples/tutorial/CMakeLists.txt
+++ b/doc/scriptexamples/tutorial/CMakeLists.txt
@@ -19,5 +19,5 @@ IF(UNIX)
INSTALL(FILES ${tutorial} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/scriptexamples/tutorial)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${tutorial} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/doc/scriptexamples/tutorial)
+ INSTALL(FILES ${tutorial} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/scriptexamples/tutorial)
ENDIF()
diff --git a/src/modules/filetransferwindow/caps/CMakeLists.txt b/src/modules/filetransferwindow/caps/CMakeLists.txt
index 5b4998926..e52ee758f 100644
--- a/src/modules/filetransferwindow/caps/CMakeLists.txt
+++ b/src/modules/filetransferwindow/caps/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for ./caps
+# CMakeLists for src/modules/filetransferwindow/caps
SET(CAPSFILE filetransferwindow)
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/tool/)
ENDIF()
diff --git a/src/modules/logview/caps/CMakeLists.txt b/src/modules/logview/caps/CMakeLists.txt
index 41088ecc0..cf53ca041 100644
--- a/src/modules/logview/caps/CMakeLists.txt
+++ b/src/modules/logview/caps/CMakeLists.txt
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/tool/)
ENDIF()
diff --git a/src/modules/mircimport/caps/CMakeLists.txt b/src/modules/mircimport/caps/CMakeLists.txt
index 279d37757..fc6aa669d 100644
--- a/src/modules/mircimport/caps/CMakeLists.txt
+++ b/src/modules/mircimport/caps/CMakeLists.txt
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/serverimport/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/serverimport/)
ENDIF()
diff --git a/src/modules/mircimport/pics/CMakeLists.txt b/src/modules/mircimport/pics/CMakeLists.txt
index 155782d40..ba59cbdf4 100644
--- a/src/modules/mircimport/pics/CMakeLists.txt
+++ b/src/modules/mircimport/pics/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for ./caps
+# CMakeLists for ./pics
SET(PICSFILE kvi_mircimport.png)
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/)
ENDIF()
diff --git a/src/modules/notifier/pics/CMakeLists.txt b/src/modules/notifier/pics/CMakeLists.txt
index 433adef8f..67a0f1bef 100644
--- a/src/modules/notifier/pics/CMakeLists.txt
+++ b/src/modules/notifier/pics/CMakeLists.txt
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/)
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/)
ENDIF()
diff --git a/src/modules/rijndael/caps/CMakeLists.txt b/src/modules/rijndael/caps/CMakeLists.txt
index 0042dbc55..fe40c9e87 100644
--- a/src/modules/rijndael/caps/CMakeLists.txt
+++ b/src/modules/rijndael/caps/CMakeLists.txt
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/crypt/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/)
ENDIF()
diff --git a/src/modules/sharedfileswindow/caps/CMakeLists.txt b/src/modules/sharedfileswindow/caps/CMakeLists.txt
index 3b6fda1f5..909f50894 100644
--- a/src/modules/sharedfileswindow/caps/CMakeLists.txt
+++ b/src/modules/sharedfileswindow/caps/CMakeLists.txt
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/tool/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/tool/)
ENDIF()
diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt
index bbd81f9a3..fba083b7b 100644
--- a/src/modules/tip/CMakeLists.txt
+++ b/src/modules/tip/CMakeLists.txt
@@ -25,5 +25,5 @@ IF(UNIX)
INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${tips} DESTINATION ${CMAKE_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/url/caps/CMakeLists.txt b/src/modules/url/caps/CMakeLists.txt
index 6334d46d1..27de66c1f 100644
--- a/src/modules/url/caps/CMakeLists.txt
+++ b/src/modules/url/caps/CMakeLists.txt
@@ -10,5 +10,5 @@ IF(UNIX)
INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/action/)
ENDIF()
ELSEIF(WIN32)
- #INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/modules/caps/action/)
+ INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/action/)
ENDIF()