Fixed #930: make git-docs is broken

Fixed #918: Link to hello_world.cpp is broken
STEllAR-GROUP · Oct 6, 2013 · 061c3a3 · 061c3a3
1 parent 5a4e452
commit 061c3a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/cmake/HPX_UpdateGitDocs.cmake b/cmake/HPX_UpdateGitDocs.cmake
@@ -37,17 +37,18 @@ file(
 if(HPX_BUILD_TYPE)
   set(doc_dir ${CMAKE_BINARY_DIR}/${HPX_BUILD_TYPE}/../share/hpx-${HPX_VERSION})
 else()
-  set(doc_dir ${CMAKE_BINARY_DIR}/../share/hpx)
+  set(doc_dir ${CMAKE_BINARY_DIR}/../share/hpx-${HPX_VERSION})
 endif()
 
 # disable copying source files for now, this needs to be fixed...
-#file(
-#  COPY ${doc_dir}/docs
-#  DESTINATION ${CMAKE_BINARY_DIR}/gh-pages)
+file(
+  COPY ${doc_dir}/docs
+  DESTINATION ${CMAKE_BINARY_DIR}/gh-pages)
 
 # copy all source files the docs depend upon
 if(HPX_DOCUMENTATION_FILES)
-  foreach(file ${HPX_DOCUMENTATION_FILES})
+  string(REPLACE " " ";" HPX_DOCUMENTATION_FILES_LIST "${HPX_DOCUMENTATION_FILES}")
+  foreach(file ${HPX_DOCUMENTATION_FILES_LIST})
     file(COPY ${file}
       DESTINATION ${CMAKE_BINARY_DIR}/gh-pages/docs/html/code)
   endforeach()

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -172,13 +172,14 @@ if(MSVC)
       -DHPX_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
       -DHPX_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
       -DHPX_VERSION="${HPX_VERSION}"
-      -DHPX_DOCUMENTATION_FILES=${documentation_dependencies}
+      -DHPX_DOCUMENTATION_FILES=\"${documentation_dependencies}\"
       -P ${CMAKE_SOURCE_DIR}/cmake/HPX_UpdateGitDocs.cmake)
 else()
   add_custom_target(git_docs
     COMMAND ${CMAKE_COMMAND}
       -DHPX_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
-      -DHPX_DOCUMENTATION_FILES=${documentation_dependencies}
+      -DHPX_VERSION="${HPX_VERSION}"
+      -DHPX_DOCUMENTATION_FILES=\"${documentation_dependencies}\"
       -P ${CMAKE_SOURCE_DIR}/cmake/HPX_UpdateGitDocs.cmake)
 endif()