fixed msys2 / mingw folders based on architecture, added license to unbound CMakeList as that is not part of standard Unbound

2 files changed, 36 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7f04c6f9..e0900c3a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,12 +67,12 @@ enable_testing()
 
 # Check whether we're on a 32-bit or 64-bit system
 if(CMAKE_SIZEOF_VOID_P EQUAL "8")
-  message(STATUS "Building on a 64-bit system")
-  set(ARCH_WIDTH "64")
+  set(DEFAULT_ARCH_WIDTH "64")
 else()
-  message(STATUS "Building on a 32-bit system")
-  set(ARCH_WIDTH "32")
+  set(DEFAULT_ARCH_WIDTH "32")
 endif()
+option(ARCH_WIDTH "Platform architecture in bits (32 or 64)" ${DEFAULT_ARCH_WIDTH})
+message(STATUS "Building for a ${ARCH_WIDTH}-bit system")
 
 # Check if we're on FreeBSD so we can exclude the local miniupnpc (it should be installed from ports instead)
 # CMAKE_SYSTEM_NAME checks are commonly known, but specifically taken from libsdl's CMakeLists
@@ -105,16 +105,16 @@ endif()
 option(STATIC "Link libraries statically" ${DEFAULT_STATIC})
 
 if(MINGW)
-  get_filename_component(msys2_install_path "[HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MSYS2 64bit;InstallLocation]" ABSOLUTE)
-  set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw64/include")
+  get_filename_component(msys2_install_path "[HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MSYS2 ${ARCH_WIDTH}bit;InstallLocation]" ABSOLUTE)
+  set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
   # This is necessary because otherwise CMake will make Boost libraries -lfoo
   # rather than a full path. Unfortunately, this makes the shared libraries get
   # linked due to a bug in CMake which misses putting -static flags around the
   # -lfoo arguments.
   list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_DIRECTORIES
-    "${msys2_install_path}/mingw64/lib")
+    "${msys2_install_path}/mingw${ARCH_WIDTH}/lib")
   list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
-    "${msys2_install_path}/mingw64/lib")
+    "${msys2_install_path}/mingw${ARCH_WIDTH}/lib")
 endif()
 
 if(STATIC)
diff --git a/external/unbound/CMakeLists.txt b/external/unbound/CMakeLists.txt
index fdfa0a0fe..b00ff9b3c 100644
--- a/external/unbound/CMakeLists.txt
+++ b/external/unbound/CMakeLists.txt
@@ -1,3 +1,31 @@
+# Copyright (c) 2014-2015, The Monero Project
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this list of
+#    conditions and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list
+#    of conditions and the following disclaimer in the documentation and/or other
+#    materials provided with the distribution.
+# 
+# 3. Neither the name of the copyright holder nor the names of its contributors may be
+#    used to endorse or promote products derived from this software without specific
+#    prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 cmake_minimum_required(VERSION 2.8.7)
 
 project(unbound C)