瀏覽代碼

fixes: gh-1786

Adding back in Cherry picked missing commit. 8ef991ac

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Philip Schwartz 13 年之前
父節點
當前提交
981da33cbf
共有 3 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      cmake_modules/commonSetup.cmake
  2. 0 0
      cmake_modules/docMacros.cmake
  3. 1 1
      docs/CMakeLists.txt

+ 2 - 0
cmake_modules/commonSetup.cmake

@@ -80,6 +80,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     set( PORTALURL "http://hpccsystems.com/download" )
   endif()
 
+  set(CMAKE_MODULE_PATH "${HPCC_SOURCE_DIR}/cmake_modules/")
+
   ##########################################################
 
   # common compiler/linker flags

docMacros.cmake → cmake_modules/docMacros.cmake


+ 1 - 1
docs/CMakeLists.txt

@@ -21,7 +21,7 @@ PROJECT(docs)
 define_property(GLOBAL PROPERTY DOC_TARGETS BRIEF_DOCS "docs" FULL_DOCS "docs")
 mark_as_advanced(DOC_TARGETS)
 
-include(${CMAKE_SOURCE_DIR}/docMacros.cmake)
+include(${CMAKE_MODULE_PATH}/docMacros.cmake)
 
 set (DOCBOOK_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/resources)
 set (DOCBOOK_XSL ${CMAKE_CURRENT_BINARY_DIR}/resources/docbook-xsl)