Merge lp:~wixkkomi/inkscape/cmake_arch into lp:~inkscape.dev/inkscape/trunk

[wixkkomi]

The gmock library on Arch provides pre-compiled shared libraries. The structure of the gmock directory is:

$ ls /usr/src/gmock
gmock-all.cc gmock-cardinalities.cc gmock.cc gmock-internal-utils.cc gmock_main.cc gmock-matchers.cc gmock-spec-builders.cc
$ ls /usr/src/gtest
cmake/ CMakeLists.txt src/

Headers and shared libraries are placed at /usr/include and /usr/lib, separately. So we simply link to those shared libraries.

Unmerged revisions

15578. By wixkkomi on 2017-03-09

Fix issue with building test on Arch Linux.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-08 21:25:30 +0000
+++ CMakeLists.txt	2017-03-09 06:05:08 +0000
@@ -102,7 +102,8 @@
 # -----------------------------------------------------------------------------
 if(NOT GMOCK_DIR)
     find_path(GMOCK_DIR
-	      NAMES src/gmock.cc
+	      NAMES "src/gmock.cc"
+	            "gmock.cc"
 	      PATHS "$ENV{GMOCK_DIR}"
 		    "/usr/src/googletest/googlemock"
 	            "/usr/src/gmock"
 
=== modified file 'testfiles/CMakeLists.txt'
--- testfiles/CMakeLists.txt	2016-08-09 09:33:34 +0000
+++ testfiles/CMakeLists.txt	2017-03-09 06:05:08 +0000
@@ -1,7 +1,13 @@
 # -----------------------------------------------------------------------------
 #
 # -----------------------------------------------------------------------------
-add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock)
+# gmock on some distros (e.g. Arch) are provided with pre-compiled
+# shared library.
+if (EXISTS "${GMOCK_DIR}/CMakeLists.txt")
+    add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock)
+else ()
+    set(INKSCAPE_LIBS gtest ${INKSCAPE_LIBS})
+endif()
 
 include_directories(SYSTEM ${GMOCK_DIR}/gtest/include
                            ${GMOCK_DIR}/include