From 9fb0ca34662f22f3f9e96124dfe66f327d2c012e Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Tue, 2 Jun 2015 11:55:49 -0700 Subject: [PATCH] cmake: fixed indentation and V8 version string Signed-off-by: Mihai Tudor Panu --- CMakeLists.txt | 2 +- cmake/modules/FindNode.cmake | 5 +++-- src/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cba1ec5..e081f1bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ if (BUILDDOC) # todo: use a separate cmake FILE module for string replacement instead COMMAND ${SPHINX_EXECUTABLE} -b html pydoc html/python COMMAND sed -i.bak s|\">pyupm_|\">|g html/python/index.html html/python/modules.html - COMMAND sed -i.bak s|[[:space:]]module||g html/python/index.html html/python/modules.html + COMMAND sed -i.bak s|[[:space:]][mM]odule||g html/python/index.html html/python/modules.html DEPENDS doc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with Sphinx" VERBATIM diff --git a/cmake/modules/FindNode.cmake b/cmake/modules/FindNode.cmake index 2da40e42..7501a167 100644 --- a/cmake/modules/FindNode.cmake +++ b/cmake/modules/FindNode.cmake @@ -38,6 +38,7 @@ if (NODE_EXECUTABLE) set (V8_VERSION_STRING ${_V8_VERSION}) string (REPLACE "." ";" _V8_VERSION_LIST "${_V8_VERSION}") string (REPLACE "." "" V8_DEFINE_STRING "${_V8_VERSION}") + string (STRIP ${V8_DEFINE_STRING} V8_DEFINE_STRING) list (GET _V8_VERSION_LIST 0 V8_VERSION_MAJOR) list (GET _V8_VERSION_LIST 1 V8_VERSION_MINOR) list (GET _V8_VERSION_LIST 2 V8_VERSION_PATCH) @@ -49,8 +50,8 @@ if (NODE_EXECUTABLE) set (NODE_VERSION_MINOR "10") set (NODE_VERSION_PATCH "30") set (V8_VERSION_MAJOR "3") - set (V8_VERSION_MAJOR "14") - set (V8_VERSION_MAJOR "5") + set (V8_VERSION_MINOR "28") + set (V8_VERSION_PATCH "72") set (V8_VERSION_STRING "3.28.72") message ("defaulted to node 0.10.30") endif () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6fdd2d4d..07519b62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,7 +66,7 @@ macro(upm_doxygen) add_dependencies (${libname}doc_i doc) if (BUILDSWIG) add_dependencies (_pyupm_${libname} ${libname}doc_i) - add_dependencies (pydoc _pyupm_${libname}) + add_dependencies (pydoc _pyupm_${libname}) else () add_dependencies (${libname} doc) endif ()