Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
mir-bzr-patch
=== modified file 'cmake/FindGtestGmock.cmake'
--- cmake/FindGtestGmock.cmake 2017-09-07 05:58:13 +0000
+++ cmake/FindGtestGmock.cmake 2017-09-19 13:22:05 +0000
@@ -20,14 +20,6 @@
HINTS ${GTEST_INSTALL_DIR}
)
-#gmock
-find_path(
- GMOCK_INSTALL_DIR CMakeLists.txt
- HINTS ${usr}/src/googletest ${usr}/src/gmock)
-if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
- message(FATAL_ERROR "google-mock package not found")
-endif()
-
find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
if (USING_GOOGLETEST_1_8)
@@ -69,25 +61,11 @@
endif()
endif()
-ExternalProject_Add(
- GMock
- #where to build in source tree
- PREFIX ${GMOCK_PREFIX}
- #where the source is external to the project
- SOURCE_DIR ${GMOCK_INSTALL_DIR}
- #forward the compilers to the subproject so cross-arch builds work
- CMAKE_ARGS ${GTEST_CMAKE_ARGS}
- BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
-
- #we don't need to install, so skip
- INSTALL_COMMAND ""
-)
-
-set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
-set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
+set(GMOCK_LIBRARY -lgmock)
+set(GMOCK_MAIN_LIBRARY -lgmock_main)
set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
-set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
-set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
+set(GTEST_LIBRARY -lgtest)
+set(GTEST_MAIN_LIBRARY -lgtest_main)
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
=== modified file 'examples/miral-shell/shell_main.cpp'
--- examples/miral-shell/shell_main.cpp 2017-08-21 15:58:34 +0000
+++ examples/miral-shell/shell_main.cpp 2017-09-19 13:47:04 +0000
@@ -83,7 +83,7 @@
{
CommandLineOption{[&](std::string const& ) { },
"desktop_file_hint", "Ignored for Unity8 compatibility", "miral-shell.desktop"},
- CursorTheme{"DMZ-White"},
+ CursorTheme{"Adwaita"},
window_managers,
display_configuration_options,
launcher,
=== modified file 'src/platforms/eglstream-kms/server/display.cpp'
--- src/platforms/eglstream-kms/server/display.cpp 2017-07-28 17:00:43 +0000
+++ src/platforms/eglstream-kms/server/display.cpp 2017-09-19 13:02:40 +0000
@@ -34,7 +34,7 @@
#include "mir/renderer/gl/render_target.h"
#include "mir/renderer/gl/context.h"
-#include <drm/drm.h>
+#include <libdrm/drm.h>
#include <xf86drmMode.h>
#include <sys/ioctl.h>
#include <system_error>
=== modified file 'src/platforms/eglstream-kms/server/egl_output.cpp'
--- src/platforms/eglstream-kms/server/egl_output.cpp 2017-07-28 17:00:43 +0000
+++ src/platforms/eglstream-kms/server/egl_output.cpp 2017-09-19 13:03:03 +0000
@@ -23,7 +23,7 @@
#include "kms-utils/kms_connector.h"
#include <cstring>
-#include <drm/drm.h>
+#include <libdrm/drm.h>
#include <sys/ioctl.h>
#include <vector>
#include <boost/throw_exception.hpp>
=== modified file 'src/platforms/mesa/server/kms/cursor.cpp'
--- src/platforms/mesa/server/kms/cursor.cpp 2017-07-31 08:58:34 +0000
+++ src/platforms/mesa/server/kms/cursor.cpp 2017-09-19 12:43:44 +0000
@@ -25,7 +25,7 @@
#include "mir/graphics/cursor_image.h"
#include <xf86drm.h>
-#include <drm/drm.h>
+#include <libdrm/drm.h>
#include <boost/exception/errinfo_errno.hpp>
=== modified file 'src/platforms/mesa/server/kms/display_buffer.cpp'
--- src/platforms/mesa/server/kms/display_buffer.cpp 2017-07-28 17:00:43 +0000
+++ src/platforms/mesa/server/kms/display_buffer.cpp 2017-09-19 12:44:17 +0000
@@ -32,7 +32,7 @@
#include <EGL/eglext.h>
#include MIR_SERVER_GL_H
#include <GLES2/gl2ext.h>
-#include <drm/drm_fourcc.h>
+#include <libdrm/drm_fourcc.h>
#include <sstream>
#include <stdexcept>
=== modified file 'src/protobuf/CMakeLists.txt'
--- src/protobuf/CMakeLists.txt 2017-05-08 03:04:26 +0000
+++ src/protobuf/CMakeLists.txt 2017-09-19 13:02:04 +0000
@@ -33,8 +33,8 @@
PROPERTIES
SOVERSION ${MIRPROTOBUF_ABI}
- LINK_FLAGS "-Wl,--version-script,${symbol_map}"
- LINK_DEPENDS ${symbol_map}
+ # LINK_FLAGS "-Wl,--version-script,${symbol_map}"
+ # LINK_DEPENDS ${symbol_map}
)
# Export the include directories
=== modified file 'src/server/run_mir.cpp'
--- src/server/run_mir.cpp 2017-07-28 17:00:43 +0000
+++ src/server/run_mir.cpp 2017-09-19 13:05:49 +0000
@@ -52,7 +52,7 @@
extern "C" { typedef void (*sig_handler)(int); }
-volatile sig_handler old_handler[SIGUNUSED] = { nullptr };
+volatile sig_handler old_handler[SIGSYS] = { nullptr };
extern "C" void fatal_signal_cleanup(int sig)
{
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
--- tests/mir_test_doubles/CMakeLists.txt 2017-08-25 06:41:20 +0000
+++ tests/mir_test_doubles/CMakeLists.txt 2017-09-19 12:41:59 +0000
@@ -79,8 +79,6 @@
${TEST_UTILS_SRCS}
)
-add_dependencies(mir-test-doubles-static GMock)
-
target_link_libraries(mir-test-doubles-static
mirserver
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
--- tests/mir_test_framework/CMakeLists.txt 2017-09-07 05:58:13 +0000
+++ tests/mir_test_framework/CMakeLists.txt 2017-09-19 12:41:43 +0000
@@ -81,8 +81,6 @@
$<TARGET_OBJECTS:mir-public-test>
)
-add_dependencies(mir-test-framework-static GMock)
-
target_link_libraries(mir-test-framework-static
mirclient
=== modified file 'tests/unit-tests/platforms/mesa/kms/test_cursor.cpp'
--- tests/unit-tests/platforms/mesa/kms/test_cursor.cpp 2017-07-31 08:58:34 +0000
+++ tests/unit-tests/platforms/mesa/kms/test_cursor.cpp 2017-09-19 13:03:05 +0000
@@ -24,7 +24,7 @@
#include "mir/graphics/cursor_image.h"
#include <xf86drm.h>
-#include <drm/drm.h>
+#include <libdrm/drm.h>
#include "mir/test/doubles/mock_gbm.h"
#include "mir/test/doubles/mock_drm.h"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.