From 71f4b10b15fb5f6764da9f8e5cdce03d62ff015b Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Wed, 24 Sep 2014 20:09:30 +0200
Subject: fixed cmake folder

---
 cmake/FindUnbound.cmake | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 cmake/FindUnbound.cmake

(limited to 'cmake/FindUnbound.cmake')

diff --git a/cmake/FindUnbound.cmake b/cmake/FindUnbound.cmake
new file mode 100644
index 000000000..3d2e8f6d7
--- /dev/null
+++ b/cmake/FindUnbound.cmake
@@ -0,0 +1,55 @@
+# 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.
+
+include (CheckIncludeFiles)
+include (CheckLibraryExists)
+include (CheckSymbolExists)
+
+set (Unbound_FOUND FALSE)
+MESSAGE("Attempting to find libunbound")
+
+#FIND_PATH("unbound.h" CMAKE_HAVE_UNBOUND_H)
+MESSAGE("CMAKE_INCLUDE_PATH: ${CMAKE_INCLUDE_PATH}")
+MESSAGE("CMAKE_SYSTEM_INCLUDE_PATH: ${CMAKE_SYSTEM_INCLUDE_PATH}")
+CHECK_INCLUDE_FILES("unbound.h" CMAKE_HAVE_UNBOUND_H)
+MESSAGE("CMAKE_HAVE_UNBOUND_H: ${CMAKE_HAVE_UNBOUND_H}")
+
+if(CMAKE_HAVE_UNBOUND_H)
+
+  MESSAGE("unbound.h found")
+
+  CHECK_LIBRARY_EXISTS(unbound ub_ctx_create "" CMAKE_HAVE_UNBOUND)
+
+  if(CMAKE_HAVE_UNBOUND)
+    MESSAGE("-lunbound works?")
+    set(CMAKE_UNBOUND_LIB "-lunbound")
+    set(Unbound_FOUND TRUE)
+  endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Unbound DEFAULT_MSG Unbound_FOUND)
-- 
cgit v1.2.3


From bff1f9d4c4c33a12349bc3e861fe4d387b749a74 Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Wed, 24 Sep 2014 20:38:24 +0200
Subject: redo FindUnbound.cmake

---
 cmake/FindUnbound.cmake | 54 ++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

(limited to 'cmake/FindUnbound.cmake')

diff --git a/cmake/FindUnbound.cmake b/cmake/FindUnbound.cmake
index 3d2e8f6d7..8d6f4ae72 100644
--- a/cmake/FindUnbound.cmake
+++ b/cmake/FindUnbound.cmake
@@ -25,31 +25,29 @@
 # 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.
 
-include (CheckIncludeFiles)
-include (CheckLibraryExists)
-include (CheckSymbolExists)
-
-set (Unbound_FOUND FALSE)
-MESSAGE("Attempting to find libunbound")
-
-#FIND_PATH("unbound.h" CMAKE_HAVE_UNBOUND_H)
-MESSAGE("CMAKE_INCLUDE_PATH: ${CMAKE_INCLUDE_PATH}")
-MESSAGE("CMAKE_SYSTEM_INCLUDE_PATH: ${CMAKE_SYSTEM_INCLUDE_PATH}")
-CHECK_INCLUDE_FILES("unbound.h" CMAKE_HAVE_UNBOUND_H)
-MESSAGE("CMAKE_HAVE_UNBOUND_H: ${CMAKE_HAVE_UNBOUND_H}")
-
-if(CMAKE_HAVE_UNBOUND_H)
-
-  MESSAGE("unbound.h found")
-
-  CHECK_LIBRARY_EXISTS(unbound ub_ctx_create "" CMAKE_HAVE_UNBOUND)
-
-  if(CMAKE_HAVE_UNBOUND)
-    MESSAGE("-lunbound works?")
-    set(CMAKE_UNBOUND_LIB "-lunbound")
-    set(Unbound_FOUND TRUE)
-  endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Unbound DEFAULT_MSG Unbound_FOUND)
+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()
-- 
cgit v1.2.3