[llvm] r189522 - [doxygen] Use correct variable names for external variable configuration and make EXTRA_SEARCH_MAPPINGS a "dumb" variable.

[Michael Gottesman]

Author: mgottesman
Date: Wed Aug 28 16:55:26 2013
New Revision: 189522

URL: http://llvm.org/viewvc/llvm-project?rev=189522&view=rev
Log:
[doxygen] Use correct variable names for external variable configuration and make EXTRA_SEARCH_MAPPINGS a "dumb" variable.

I do not think the massaging that I was doing for EXTRA_SEARCH_MAPPINGS was
truly necessary.

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/docs/CMakeLists.txt
    llvm/trunk/docs/Makefile
    llvm/trunk/docs/doxygen.cfg.in

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=189522&r1=189521&r2=189522&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Wed Aug 28 16:55:26 2013
@@ -473,8 +473,12 @@ if (LLVM_ENABLE_DOXYGEN)
     if (LLVM_BUILD_DOCS)
       add_custom_target(doxygen ALL)
     endif()
-    option(DOXYGEN_EXTERNAL_SEARCH "Enable doxygen external search." OFF)
-    set(DOXYGEN_SEARCH_MAPPINGS "" CACHE STRING "Doxygen Search Mappings")
+
+    option(LLVM_DOXYGEN_EXTERNAL_SEARCH "Enable doxygen external search." OFF)
+    if (LLVM_DOXYGEN_EXTERNAL_SEARCH)
+      set(LLVM_DOXYGEN_SEARCHENGINE_URL "" CACHE STRING "URL to use for external searhc.")
+      set(LLVM_DOXYGEN_SEARCH_MAPPINGS "" CACHE STRING "Doxygen Search Mappings")
+    endif()
   endif()
 else()
   message(STATUS "Doxygen disabled.")

Modified: llvm/trunk/docs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMakeLists.txt?rev=189522&r1=189521&r2=189522&view=diff
==============================================================================
--- llvm/trunk/docs/CMakeLists.txt (original)
+++ llvm/trunk/docs/CMakeLists.txt Wed Aug 28 16:55:26 2013
@@ -8,36 +8,31 @@ if (LLVM_ENABLE_DOXYGEN)
     set(DOT ${LLVM_PATH_DOT})
   endif()
 
-  if (DOXYGEN_EXTERNAL_SEARCH)
-    set(SEARCHENGINE "YES")
-    set(SERVER_BASED_SEARCH "YES")
-    set(EXTERNAL_SEARCH "YES")
-
-    set(EXTRA_SEARCH_MAPPINGS "")
-    foreach(NameAndValue ${DOXYGEN_SEARCH_MAPPINGS})
-      # Strip leading spaces
-      string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
-      # Find variable name
-      string(REGEX MATCH "^[^=]+" Name ${NameAndValue})
-      # Find the value
-      string(REPLACE "${Name}=" "" Value ${NameAndValue})
-      # Set the variable
-      if (NOT ${Name} EQUALS llvm)
-	set(EXTRA_SEARCH_MAPPINGS "${EXTRA_SEARCH_MAPPINGS} ${LLVM_BINARY_DIR}/${NameAndValue}")
-      endif()
-    endforeach()
+  if (LLVM_DOXYGEN_EXTERNAL_SEARCH)
+    set(enable_searchengine "YES")
+    set(searchengine_url "${LLVM_DOXYGEN_SEARCHENGINE_URL}")
+    set(enable_server_based_search "YES")
+    set(enable_external_search "YES")
+    set(extra_search_mappings "${LLVM_DOXYGEN_SEARCH_MAPPINGS}")
   else()
-    set(SEARCHENGINE "NO")
-    set(SERVER_BASED_SEARCH "NO")
-    set(EXTERNAL_SEARCH "NO")
-    set(EXTRA_SEARCH_MAPPINGS "")
+    set(enable_searchengine "NO")
+    set(searchengine_url "")
+    set(enable_server_based_search "NO")
+    set(enable_external_search "NO")
+    set(extra_search_mappings "")
   endif()
   
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxygen.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg @ONLY)
+
   set(abs_top_srcdir)
   set(abs_top_builddir)
   set(DOT)
+  set(enable_searchengine)
+  set(searchengine_url)
+  set(enable_server_based_search)
+  set(enable_external_search)
+  set(extra_search_mappings)
 
   add_custom_target(doxygen-llvm
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg

Modified: llvm/trunk/docs/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Makefile?rev=189522&r1=189521&r2=189522&view=diff
==============================================================================
--- llvm/trunk/docs/Makefile (original)
+++ llvm/trunk/docs/Makefile Wed Aug 28 16:55:26 2013
@@ -21,9 +21,10 @@ $(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg
 	  -e 's/@PACKAGE_VERSION@/mainline/' \
 	  -e 's/@abs_top_builddir@/../g' \
 	  -e 's/@enable_searchengine@/NO/g' \
-          -e 's/@enable_server_based_search@/NO/g' \
+	  -e 's/@searchengine_url@//g' \
+	  -e 's/@enable_server_based_search@/NO/g' \
 	  -e 's/@enable_external_search@/NO/g' \
-	  -e 's/@extra_search_mappings@/NO/g' > $@
+	  -e 's/@extra_search_mappings@//g' > $@
 endif
 
 include $(LEVEL)/Makefile.common

Modified: llvm/trunk/docs/doxygen.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/doxygen.cfg.in?rev=189522&r1=189521&r2=189522&view=diff
==============================================================================
--- llvm/trunk/docs/doxygen.cfg.in (original)
+++ llvm/trunk/docs/doxygen.cfg.in Wed Aug 28 16:55:26 2013
@@ -1081,6 +1081,8 @@ SEARCHENGINE           = @enable_searche
 
 SERVER_BASED_SEARCH    = @enable_server_based_search@
 
+SEARCHENGINE_URL       = @searchengine_url@
+
 EXTERNAL_SEARCH        = @enable_external_search@
 
 EXTERNAL_SEARCH_ID     = llvm