Merge lp:~muktupavels/compiz/remove-warnings into lp:compiz/0.9.13

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 4183
Merged at revision: 4181
Proposed branch: lp:~muktupavels/compiz/remove-warnings
Merge into: lp:compiz/0.9.13
Prerequisite: lp:~muktupavels/compiz/drop-xig
Diff against target: 34 lines (+1/-16)
1 file modified
cmake/base.cmake (+1/-16)
To merge this branch: bzr merge lp:~muktupavels/compiz/remove-warnings
Reviewer Review Type Date Requested Status
Dmitry Shachnev Approve
Review via email: mp+350731@code.launchpad.net

Commit message

Remove useless warnings.

Description of the change

It is very weird to warn about missing files that will be installed by compiz.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/base.cmake'
2--- cmake/base.cmake 2018-07-24 14:42:51 +0000
3+++ cmake/base.cmake 2018-07-24 14:42:52 +0000
4@@ -17,14 +17,6 @@
5 endfunction ()
6
7 function (_check_compiz_cmake_macro)
8- find_file (_find_compiz FindCompiz.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
9- if (NOT _find_compiz)
10- compiz_color_message ("${_escape}[1;31mWARNING:${_escape}[0m")
11- message ("\"FindCompiz.cmake\" file not found in cmake module directories.")
12- message ("It should be installed to allow building of external compiz packages.")
13- message ("Call \"sudo make findcompiz_install\" to install it.\n")
14- compiz_print_configure_footer ()
15- endif ()
16 install (FILES
17 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake
18 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake
19@@ -35,14 +27,7 @@
20 ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules &&
21 ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules
22 )
23- find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN})
24- if (NOT _find_compizconfig)
25- compiz_color_message ("${_escape}[1;31mWARNING:${_escape}[0m")
26- message ("\"FindCompizConfig.cmake\" file not found in cmake module directories.")
27- message ("It should be installed to allow building of external compiz packages.")
28- message ("Call \"sudo make findcompiz_install\" to install it.\n")
29- compiz_print_configure_footer ()
30- endif (NOT _find_compizconfig)
31+
32 install (FILES
33 ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake
34 DESTINATION

Subscribers

People subscribed via source and target branches