From bed1d4d5ed265083b340aed398403cbaba46e340 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 21 Oct 2014 18:36:15 -0700
Subject: [PATCH 2/3] Only install glib DLL on MSVC
Subject: [PATCH] Only install glib DLL on MSVC
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbdf75a..7690630 100644
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,7 @@ IF(BUILD_DOC)
@@ -164,7 +164,7 @@ IF(BUILD_DOC)
ADD_SUBDIRECTORY(docs)
ENDIF()
@ -190,41 +188,24 @@ index bbdf75a..7690630 100644
FIND_FILE(GLIB2_DLL
NAMES glib-2.dll glib-2-vs9.dll
PATHS "${GLIB2_BASE_DIR}/bin"
--
1.9.1
From ccdd4f111b4c45bd654531650e4cdb25fdd38b6c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 21 Oct 2014 18:41:09 -0700
Subject: [PATCH 3/3] Add option whether or not to install into source tree on
WIN32
Date: Tue, 21 Oct 2014 18:54:03 -0700
Subject: [PATCH] pkgconfig: Explicitly depend on libstdc++
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Fixes MinGW static.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7690630..ef8cf65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,9 @@ OPTION(BUILD_FOR_SSE "Build with support for SSE" ON)
OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ON)
OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
+IF(WIN32)
+ OPTION(INSTALL_IN_TREE "Install into source tree" ON)
+ENDIF()
IF(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug CACHE STRING
@@ -102,7 +105,7 @@ IF(BUILD_DOC)
SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
ENDIF(BUILD_DOC)
-IF(WIN32)
+IF(WIN32 AND INSTALL_IN_TREE)
# install into place in build-dir
SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")