瀏覽代碼

cmake: fixed indentation and V8 version string

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Mihai Tudor Panu 9 年之前
父節點
當前提交
9fb0ca3466
共有 3 個檔案被更改,包括 5 行新增4 行删除
  1. 1
    1
      CMakeLists.txt
  2. 3
    2
      cmake/modules/FindNode.cmake
  3. 1
    1
      src/CMakeLists.txt

+ 1
- 1
CMakeLists.txt 查看文件

@@ -90,7 +90,7 @@ if (BUILDDOC)
90 90
       # todo: use a separate cmake FILE module for string replacement instead
91 91
       COMMAND ${SPHINX_EXECUTABLE} -b html pydoc html/python
92 92
       COMMAND sed -i.bak s|\">pyupm_|\">|g html/python/index.html html/python/modules.html
93
-      COMMAND sed -i.bak s|[[:space:]]module</a>|</a>|g html/python/index.html html/python/modules.html
93
+      COMMAND sed -i.bak s|[[:space:]][mM]odule</a>|</a>|g html/python/index.html html/python/modules.html
94 94
       DEPENDS doc
95 95
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
96 96
       COMMENT "Generating API documentation with Sphinx" VERBATIM

+ 3
- 2
cmake/modules/FindNode.cmake 查看文件

@@ -38,6 +38,7 @@ if (NODE_EXECUTABLE)
38 38
         set (V8_VERSION_STRING ${_V8_VERSION})
39 39
         string (REPLACE "." ";" _V8_VERSION_LIST "${_V8_VERSION}")
40 40
         string (REPLACE "." "" V8_DEFINE_STRING "${_V8_VERSION}")
41
+        string (STRIP ${V8_DEFINE_STRING} V8_DEFINE_STRING)
41 42
         list (GET _V8_VERSION_LIST 0 V8_VERSION_MAJOR)
42 43
         list (GET _V8_VERSION_LIST 1 V8_VERSION_MINOR)
43 44
         list (GET _V8_VERSION_LIST 2 V8_VERSION_PATCH)
@@ -49,8 +50,8 @@ if (NODE_EXECUTABLE)
49 50
         set (NODE_VERSION_MINOR "10")
50 51
         set (NODE_VERSION_PATCH "30")
51 52
         set (V8_VERSION_MAJOR "3")
52
-        set (V8_VERSION_MAJOR "14")
53
-        set (V8_VERSION_MAJOR "5")
53
+        set (V8_VERSION_MINOR "28")
54
+        set (V8_VERSION_PATCH "72")
54 55
         set (V8_VERSION_STRING "3.28.72")
55 56
         message ("defaulted to node 0.10.30")
56 57
     endif ()

+ 1
- 1
src/CMakeLists.txt 查看文件

@@ -66,7 +66,7 @@ macro(upm_doxygen)
66 66
     add_dependencies (${libname}doc_i doc)
67 67
     if (BUILDSWIG)
68 68
       add_dependencies (_pyupm_${libname} ${libname}doc_i)
69
-	  add_dependencies (pydoc _pyupm_${libname})
69
+      add_dependencies (pydoc _pyupm_${libname})
70 70
     else ()
71 71
       add_dependencies (${libname} doc)
72 72
     endif ()