Merge with origin/master

3 files changed, 91 insertions, 0 deletions

diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake
new file mode 100644
index 000000000..4543c1066
--- /dev/null
+++ b/cmake/32-bit-toolchain.cmake
@@ -0,0 +1,19 @@
+set (CMAKE_SYSTEM_NAME Windows)
+
+set (GCC_PREFIX i686-w64-mingw32)
+set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
+#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
+set (CMAKE_RC_COMPILER windres)
+
+set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw32")
+
+# Ensure cmake doesn't find things in the wrong places
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
+
+set (MINGW_FLAG "-m32")
+set (USE_LTO_DEFAULT false)
diff --git a/cmake/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake
new file mode 100644
index 000000000..e9b3cc51b
--- /dev/null
+++ b/cmake/64-bit-toolchain.cmake
@@ -0,0 +1,19 @@
+set (CMAKE_SYSTEM_NAME Windows)
+
+set (GCC_PREFIX x86_64-w64-mingw32)
+set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
+#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
+set (CMAKE_RC_COMPILER windres)
+
+set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw64")
+
+# Ensure cmake doesn't find things in the wrong places
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
+
+set (MINGW_FLAG "-m64")
+set (USE_LTO_DEFAULT false)
diff --git a/cmake/FindUnbound.cmake b/cmake/FindUnbound.cmake
new file mode 100644
index 000000000..8d6f4ae72
--- /dev/null
+++ b/cmake/FindUnbound.cmake
@@ -0,0 +1,53 @@
+# Copyright (c) 2014, 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.
+
+MESSAGE("Looking for libunbound")
+
+FIND_PATH(UNBOUND_INCLUDE_DIR
+  NAMES unbound.h
+  PATH_SUFFIXES include/ include/unbound/
+  PATHS "${PROJECT_SOURCE_DIR}"
+  ${UNBOUND_ROOT}
+  $ENV{UNBOUND_ROOT}
+  /usr/local/
+  /usr/
+)
+
+find_library(UNBOUND_LIBRARIES unbound)
+
+IF(UNBOUND_INCLUDE_DIR)
+  MESSAGE(STATUS "Found unbound include in ${UNBOUND_INCLUDE_DIR}")
+  IF(UNBOUND_LIBRARIES)
+    MESSAGE(STATUS "Found unbound library")
+    set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR})
+    set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES})
+  ELSE()
+    MESSAGE(FATAL_ERROR "Could not find unbound library")
+  ENDIF()
+ELSE()
+  MESSAGE(FATAL_ERROR "Could not find unbound library")
+ENDIF()