From e3c869b05af8902af66149165c2760dc05d71a44 Mon Sep 17 00:00:00 2001
From: Dragos Carp <dragoscarp@gmail.com>
Date: Wed, 21 May 2014 05:14:39 -0700
Subject: [PATCH] Fixed dependencies includes

---
 cmake-d/UseDub.cmake        | 26 ++++++++++++++++++--------
 cmake-d/UseDub/DubToCMake.d |  9 +++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/cmake-d/UseDub.cmake b/cmake-d/UseDub.cmake
index ea8a053..2cd3267 100644
--- a/cmake-d/UseDub.cmake
+++ b/cmake-d/UseDub.cmake
@@ -13,7 +13,9 @@
 # See LICENSE for details.
 #
 
-set(DUB_DIRECTORY ${CMAKE_BINARY_DIR}/UseDub CACHE PATH "Dub packages direcotry")
+if(NOT DUB_DIRECTORY)
+	set(DUB_DIRECTORY ${CMAKE_BINARY_DIR}/UseDub CACHE PATH "Dub packages directory")
+endif(NOT DUB_DIRECTORY)
 
 set(DUB_REGISTRY "http://code.dlang.org/packages")
 file(MAKE_DIRECTORY ${DUB_DIRECTORY}/CMakeTmp)
@@ -23,25 +25,26 @@ if(NOT CMAKE_D_COMPILER)
 endif(NOT CMAKE_D_COMPILER)
 
 #compile json parsers
-if(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubUrl OR 1)
+if(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubUrl)
 	find_file(DUB_GET_PACKAGE_URL_D_SRC "DubUrl.d"
 		PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH} NO_DEFAULT_PATH
 		PATH_SUFFIXES "UseDub")
 	find_file(SEMVER_SRC "semver.d"
 		PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH} NO_DEFAULT_PATH
 		PATH_SUFFIXES "UseDub")
-	execute_process(COMMAND ${CMAKE_D_COMPILER} ${DUB_GET_PACKAGE_URL_D_SRC} ${SEMVER_SRC}
+	get_filename_component(SEMVER_PATH ${SEMVER_SRC} PATH)
+	execute_process(COMMAND ${CMAKE_D_COMPILER} -I${SEMVER_PATH} ${DUB_GET_PACKAGE_URL_D_SRC} ${SEMVER_SRC}
 		WORKING_DIRECTORY ${DUB_DIRECTORY}/CMakeTmp)
 	unset(DUB_GET_PACKAGE_URL_D_SRC CACHE)
-endif(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubUrl OR 1)
-if(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubToCMake OR 1)
+endif(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubUrl)
+if(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubToCMake)
 	find_file(DUB_PACKAGE_TO_CMAKE_D_SRC "DubToCMake.d"
 		PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH} NO_DEFAULT_PATH
 		PATH_SUFFIXES "UseDub")
 	execute_process(COMMAND ${CMAKE_D_COMPILER} ${DUB_PACKAGE_TO_CMAKE_D_SRC}
 		WORKING_DIRECTORY ${DUB_DIRECTORY}/CMakeTmp)
 	unset(DUB_PACKAGE_TO_CMAKE_D_SRC CACHE)
-endif(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubToCMake OR 1)
+endif(NOT EXISTS ${DUB_DIRECTORY}/CMakeTmp/DubToCMake)
 
 include(ExternalProject)
 
@@ -61,8 +64,15 @@ function(DubProject_Add name)
 	include(${DUB_DIRECTORY}/${name}.cmake)
 
 	ExternalProject_Add(${name}
-		DOWNLOAD_DIR ${DUB_DIRECTORY}/${name}
+		DOWNLOAD_DIR ${DUB_DIRECTORY}/archive/${name}
+		SOURCE_DIR ${DUB_DIRECTORY}/source/${name}
 		URL ${DUB_PACKAGE_URL}
 		PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -p package.json
-		CMAKE_CACHE_ARGS -DCMAKE_MODULE_PATH:PATH=${CMAKE_MODULE_PATH})
+		INSTALL_DIR ${DUB_DIRECTORY}/export
+		CMAKE_CACHE_ARGS
+			-DCMAKE_MODULE_PATH:PATH=${CMAKE_MODULE_PATH}
+			-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+			-DDUB_DIRECTORY:PATH=${DUB_DIRECTORY})
+
+	include_directories(${DUB_DIRECTORY}/source/${name}/source ${DUB_DIRECTORY}/source/${name}/src)
 endfunction()
diff --git a/cmake-d/UseDub/DubToCMake.d b/cmake-d/UseDub/DubToCMake.d
index a5b3fd2..d232f08 100644
--- a/cmake-d/UseDub/DubToCMake.d
+++ b/cmake-d/UseDub/DubToCMake.d
@@ -36,6 +36,8 @@ file(GLOB_RECURSE SRC_FILES source/*.d src/*.d)
 if(APP_MAIN_FILE)
     list(REMOVE_ITEM SRC_FILES ${APP_MAIN_FILE})
 endif(APP_MAIN_FILE)
+
+include_directories(source src)
 >".format(root["name"].str);
 
     switch ("targetType" in root.object ? root["targetType"].str : "autodetect")
@@ -78,6 +80,13 @@ add_library(%s SHARED ${SRC_FILES})
             break;
     }
 
+    cmake ~= q"<
+install(TARGETS %s
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib)
+>".format(target);
+
     if ("dependencies" in root.object)
     {
         cmake ~= "\ninclude(UseDub)\n";