From 9562260201fde8a04eaf079efd751003cd1b034b Mon Sep 17 00:00:00 2001
From: Snaipe <franklinmathieu@gmail.com>
Date: Sun, 17 Jan 2016 15:43:54 +0100
Subject: [PATCH] Fixed external project build for nanomsg

---
 CMakeLists.txt               | 25 ++++++++++++++++---------
 dependencies/nanomsg-patched |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf7c4a..c3ce3cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,17 +33,24 @@ include_directories(SYSTEM
 )
 
 if (MSVC)
-  set(NN_INCL_DIR ${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/include)
-  set(NN_INCL_DEST ${NN_INCL_DIR}/nanomsg)
-  set(NN_TESTS OFF)
-  set(NN_TOOLS OFF)
 
-  add_subdirectory(dependencies/nanomsg-patched EXCLUDE_FROM_ALL)
-  file(GLOB NN_HEADERS "dependencies/nanomsg-patched/src/*.h")
-  file(MAKE_DIRECTORY "${NN_INCL_DEST}")
-  file(COPY ${NN_HEADERS} DESTINATION "${NN_INCL_DEST}")
+  include(ExternalProject)
+
+  externalproject_add(
+      nanomsg
+      SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/nanomsg-patched"
+      PREFIX "${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched"
+
+      UPDATE_COMMAND ""
+      CONFIGURE_COMMAND "${CMAKE_COMMAND} -DNN_TESTS=OFF <SOURCE_DIR>"
+  )
+
+  externalproject_get_property(nanomsg install_dir)
+  set(NANOMSG_INSTALL_DIR "${install_dir}")
+
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/include/)
+  link_directories(${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/lib/)
 
-  include_directories("${NN_INCL_DIR}")
 else ()
 
   include(ExternalProject)
diff --git a/dependencies/nanomsg-patched b/dependencies/nanomsg-patched
index e0d49e1..347de44 160000
--- a/dependencies/nanomsg-patched
+++ b/dependencies/nanomsg-patched
@@ -1 +1 @@
-Subproject commit e0d49e180b93ad1557f447d43654d28793512aca
+Subproject commit 347de44744682ac0a60ad9df461bbb27724afd15