blob: 340509c1f95ebb52f45eb5b43dbaf86118b74d4e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13b92c4..63e463c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,9 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
-#if(NOT CMAKE_INSTALL_PREFIX)
+if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "/usr")
-#endif()
+endif()
@@ -54,6 +54,7 @@ add_subdirectory (editcase)
add_subdirectory (align)
add_subdirectory (autowrap)
add_subdirectory (drawline)
+add_subdirectory (far-gvfs)
add_subdirectory (editorcomp)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/far2l/CMakeLists.txt b/far2l/CMakeLists.txt
index cfde084..aa30aa1 100644
--- a/far2l/CMakeLists.txt
+++ b/far2l/CMakeLists.txt
@@ -188,6 +188,6 @@ add_custom_command(TARGET far2l POST_BUILD
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
#TODO
else()
- install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "/usr/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "/usr/share/applications")
+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "${CMAKE_INSTALL_PREFIX}/share" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*")
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
endif()
|