Merge lp:~midori/midori/confucious into lp:midori

Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6413
Merged at revision: 6416
Proposed branch: lp:~midori/midori/confucious
Merge into: lp:midori
Diff against target: 37 lines (+22/-0)
2 files modified
CMakeLists.txt (+1/-0)
config/CMakeLists.txt (+21/-0)
To merge this branch: bzr merge lp:~midori/midori/confucious
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+187920@code.launchpad.net

Commit message

Add CMakeLists.txt for config directory

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-09-22 14:40:37 +0000
+++ CMakeLists.txt 2013-09-26 21:40:52 +0000
@@ -236,6 +236,7 @@
236add_subdirectory (po)236add_subdirectory (po)
237add_subdirectory (icons)237add_subdirectory (icons)
238add_subdirectory (data)238add_subdirectory (data)
239add_subdirectory (config)
239enable_testing()240enable_testing()
240add_subdirectory (tests)241add_subdirectory (tests)
241add_subdirectory (extensions)242add_subdirectory (extensions)
242243
=== added file 'config/CMakeLists.txt'
--- config/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ config/CMakeLists.txt 2013-09-26 21:40:52 +0000
@@ -0,0 +1,21 @@
1# Copyright (C) 2013 Olivier Duchateau
2
3set (SYSCONFDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR})
4set (XDG_CONFIG_DIR "xdg/${CMAKE_PROJECT_NAME}")
5
6file (GLOB_RECURSE CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
7list (REMOVE_ITEM CONFIG_FILES "CMakeLists.txt")
8
9foreach (FILE ${CONFIG_FILES})
10 string (FIND ${FILE} "adblock" ADBLOCK_CONF)
11 if (ADBLOCK_CONF GREATER -1)
12 string (REPLACE "config" "" dirname ${FILE})
13 install (FILES ${FILE}
14 DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}/${dirname}")
15 message("${CMAKE_PROJECT_NAME}")
16 else ()
17 install (FILES ${FILE}
18 DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}")
19 message("${FILE}")
20 endif ()
21endforeach ()

Subscribers

People subscribed via source and target branches

to all changes: