From ecc5d018c5b8b4e21edf7fb57f71c26135022b0d Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 12 Sep 2016 21:29:21 +0300 Subject: [PATCH] cmake/backbone submodule updated: Override NSIS.InstallOptions only if needed. --- CMakeLists.txt | 1 + cmake/backbone | 2 +- desktop | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0295e6c..00bba40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8) INCLUDE (ExternalProject) LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone) +LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone/override/nsis.installoptions) SET (PROJECT_LOWERCASE_NAME "laview-win32-bundle") SET (PROJECT_DESCRIPTION "LAview Win32 Bundle.") diff --git a/cmake/backbone b/cmake/backbone index 4f7de88..784ca10 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit 4f7de885ed10b1eda1cde68141866e0170a3d18b +Subproject commit 784ca10a530e629885236e9df7fdf5647ddffa7c diff --git a/desktop b/desktop index faf2f8d..b3ebc5d 160000 --- a/desktop +++ b/desktop @@ -1 +1 @@ -Subproject commit faf2f8d57ef1b3ca7f552874826c329e7e4862ff +Subproject commit b3ebc5da405cfcf1e10ff5c1ceece25c6b81a209