From 0309153e205dd8de4fbcb4570faf6c5b8901d029 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Thu, 16 Jun 2016 23:29:26 +0300 Subject: [PATCH] Gobject Plugin added. --- .gitmodules | 3 +++ CMakeLists.txt | 8 ++++++++ cpack/CMakeLists.txt | 9 ++++++++- gobject-plugin | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) create mode 160000 gobject-plugin diff --git a/.gitmodules b/.gitmodules index d9548ca..de9d491 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "cmake/backbone"] path = cmake/backbone url = git@git.backbone.ws:cmake/backbone.git +[submodule "gobject-plugin"] + path = gobject-plugin + url = git@git.backbone.ws:gobject/plugin.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 28a1aa6..21e91b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,14 @@ ExternalProject_Add (core INSTALL_DIR bundle ) +ExternalProject_Add (gobject-plugin + SOURCE_DIR ${CMAKE_SOURCE_DIR}/gobject-plugin + #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle +# PREFIX gobject-plugin + INSTALL_DIR bundle +) + ExternalProject_Add (latex-struct SOURCE_DIR ${CMAKE_SOURCE_DIR}/latex-struct #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle diff --git a/cpack/CMakeLists.txt b/cpack/CMakeLists.txt index c0ca677..406d7ea 100644 --- a/cpack/CMakeLists.txt +++ b/cpack/CMakeLists.txt @@ -18,7 +18,14 @@ SET (CPACK_CREATE_DESKTOP_LINKS "..\\\\win${ARCH}\\\\bundle\\\\bin\\\\laview-des FILE (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bundle/bin) -FOREACH (libname libgio-2.0-0.dll libgmodule-2.0-0.dll libglib-2.0-0.dll) +FOREACH (libname + libatk-1.0-0.dll libbz2-1.dll libcairo-2.dll libcairo-gobject-2.dll libepoxy-0.dll + libexpat-1.dll libffi-6.dll libfontconfig-1.dll libfreetype-6.dll libgcc_s_seh-1.dll + libgdk_pixbuf-2.0-0.dll libgdk-3-0.dll libgee-0.8-2.dll libgio-2.0-0.dll libglib-2.0-0.dll + libgmodule-2.0-0.dll libgobject-2.0-0.dll libgraphite2.dll libgtk-3-0.dll libharfbuzz-0.dll + libiconv-2.dll libintl-8.dll libpango-1.0-0.dll libpangocairo-1.0-0.dll libpangoft2-1.0-0.dll + libpangowin32-1.0-0.dll libpcre-1.dll libpixman-1-0.dll libpng16-16.dll libstdc++-6.dll + libwinpthread-1.dll zlib1.dll) EXECUTE_PROCESS (COMMAND ln -sf /mingw${ARCH}/bin/${libname} ${CMAKE_BINARY_DIR}/bundle/bin/${libname}) ENDFOREACH (libname) diff --git a/gobject-plugin b/gobject-plugin new file mode 160000 index 0000000..d5f9829 --- /dev/null +++ b/gobject-plugin @@ -0,0 +1 @@ +Subproject commit d5f982970e7affe687131fd0bcc05d6e6f12b7ed