Merging with subprojects

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/biddisco/CMake.git subproject
+# CMake/common https://github.com/Eyescale/CMake.git subproject

CMake/FindPackages.cmake

@@ -66,7 +66,7 @@ if(Boost_name)
   endif()
 endif()
 
-set(DASH_BUILD_DEBS autoconf;automake;cmake;doxygen;git;git-review;libavahi-compat-libdnssd-dev;libboost-filesystem-dev;libboost-regex-dev;libboost-serialization-dev;libboost-system-dev;libhwloc-dev;libjpeg-turbo8-dev;libturbojpeg;pkg-config;subversion)
+set(DASH_BUILD_DEBS autoconf;automake;cmake;doxygen;git;git-review;libavahi-compat-libdnssd-dev;libboost-filesystem-dev;libboost-regex-dev;libboost-serialization-dev;libboost-system-dev;libhwloc-dev;libjpeg-turbo8-dev;libleveldb-dev;libturbojpeg;pkg-config;subversion)
 
 set(DASH_DEPENDS Lunchbox;Boost)
 
@@ -78,14 +78,15 @@ endif()
 if(NOT OPTIONS_CMAKE)
   set(OPTIONS_CMAKE ${CMAKE_BINARY_DIR}/options.cmake)
 endif()
-set(DEFINES_FILE "${CMAKE_CURRENT_BINARY_DIR}/include/${PROJECT_INCLUDE_NAME}/defines${SYSTEM}.h")
+set(DEFINES_FILE "${CMAKE_BINARY_DIR}/include/${PROJECT_INCLUDE_NAME}/defines${SYSTEM}.h")
 list(APPEND COMMON_INCLUDES ${DEFINES_FILE})
 set(DEFINES_FILE_IN ${DEFINES_FILE}.in)
 file(WRITE ${DEFINES_FILE_IN}
   "// generated by CMake/FindPackages.cmake, do not edit.\n\n"
   "#ifndef ${CMAKE_PROJECT_NAME}_DEFINES_${SYSTEM}_H\n"
   "#define ${CMAKE_PROJECT_NAME}_DEFINES_${SYSTEM}_H\n\n")
-file(WRITE ${OPTIONS_CMAKE} "# Optional modules enabled during build\n")
+file(WRITE ${OPTIONS_CMAKE} "# Optional modules enabled during build\n"
+  "list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})\n")
 foreach(DEF ${FIND_PACKAGES_DEFINES})
   add_definitions(-D${DEF}=1)
   file(APPEND ${DEFINES_FILE_IN}

CMake/GitExternal.cmake

@@ -52,7 +52,7 @@ function(GIT_EXTERNAL DIR REPO TAG)
 
   if(IS_DIRECTORY "${DIR}/.git")
     if (${GIT_EXTERNAL_NO_UPDATE})
-      GIT_EXTERNAL_MESSAGE("Update branch disabled by user")
+      GIT_EXTERNAL_MESSAGE("git update disabled by user")
     else()
       GIT_EXTERNAL_MESSAGE("current ref is \"${currentref}\" and tag is \"${TAG}\"")
       if(currentref STREQUAL TAG) # nothing to do

CMakeLists.txt

@@ -5,8 +5,8 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 project(dash)
 set(CMAKE_MACPORTS_NAME libdash)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMake/common)
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
+  ${PROJECT_SOURCE_DIR}/CMake/common)
 
 include(GitExternal)
 include(Buildyard)
@@ -32,7 +32,7 @@ set(DASH_DEPENDENT_LIBRARIES Lunchbox)
 add_subdirectory(dash)
 add_subdirectory(tests)
 
-file(GLOB DOC_PDF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/*.pdf)
+file(GLOB DOC_PDF_FILES ${PROJECT_SOURCE_DIR}/doc/*.pdf)
 foreach(DOC_PDF_FILE ${DOC_PDF_FILES})
   set(DOXYGEN_EXTRA_FILES "${DOXYGEN_EXTRA_FILES} ${DOC_PDF_FILE}")
 endforeach()

tests/CMakeLists.txt

@@ -2,9 +2,11 @@
 
 # Change this number when adding tests to force a CMake run: 2
 
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/tests)
 
 set(TEST_LIBRARIES dash)
 include(CommonCTest)
 
 install(FILES ${TEST_FILES} DESTINATION share/dash/tests COMPONENT examples)
+
+