alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 01:10:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fixed indentation and V8 version string

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2015-06-02 11:55:49 -07:00
parent d6ce082274
commit 9fb0ca3466
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

5
cmake/modules/FindNode.cmake
View File

@ -38,6 +38,7 @@ if (NODE_EXECUTABLE)
set (V8_VERSION_STRING ${_V8_VERSION}) set (V8_VERSION_STRING ${_V8_VERSION})
string (REPLACE "." ";" _V8_VERSION_LIST "${_V8_VERSION}") string (REPLACE "." ";" _V8_VERSION_LIST "${_V8_VERSION}")
string (REPLACE "." "" V8_DEFINE_STRING "${_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 0 V8_VERSION_MAJOR)
list (GET _V8_VERSION_LIST 1 V8_VERSION_MINOR) list (GET _V8_VERSION_LIST 1 V8_VERSION_MINOR)
list (GET _V8_VERSION_LIST 2 V8_VERSION_PATCH) list (GET _V8_VERSION_LIST 2 V8_VERSION_PATCH)
@ -49,8 +50,8 @@ if (NODE_EXECUTABLE)
set (NODE_VERSION_MINOR "10") set (NODE_VERSION_MINOR "10")
set (NODE_VERSION_PATCH "30") set (NODE_VERSION_PATCH "30")
set (V8_VERSION_MAJOR "3") set (V8_VERSION_MAJOR "3")
set (V8_VERSION_MAJOR "14") set (V8_VERSION_MINOR "28")
set (V8_VERSION_MAJOR "5") set (V8_VERSION_PATCH "72")
set (V8_VERSION_STRING "3.28.72") set (V8_VERSION_STRING "3.28.72")
message ("defaulted to node 0.10.30") message ("defaulted to node 0.10.30")
endif () endif ()

2
src/CMakeLists.txt
View File

@ -66,7 +66,7 @@ macro(upm_doxygen)
add_dependencies (${libname}doc_i doc) add_dependencies (${libname}doc_i doc)
if (BUILDSWIG) if (BUILDSWIG)
add_dependencies (_pyupm_${libname} ${libname}doc_i) add_dependencies (_pyupm_${libname} ${libname}doc_i)
add_dependencies (pydoc _pyupm_${libname}) add_dependencies (pydoc _pyupm_${libname})
else () else ()
add_dependencies (${libname} doc) add_dependencies (${libname} doc)
endif () endif ()