Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "unfuck windows by copying the gtest header into the V8 target directory" it didn't work - we now have a matching git repo for this lonely header. 

This reverts commit 6777a4143b.
This commit is contained in:
Wilfried Goesgens 2017-02-13 20:40:43 +01:00
parent 31730ed86c
commit 2cb3169c54
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
3rdParty/V8/CMakeLists.txt vendored
View File

@ -323,7 +323,6 @@ elseif (WIN32)
foreach (MS_TARGET_CONF ${V8_TARGET_ARCHS}) foreach (MS_TARGET_CONF ${V8_TARGET_ARCHS})
string(TOLOWER ${MS_TARGET_CONF} MS_TARGET_CONF_LOWER) string(TOLOWER ${MS_TARGET_CONF} MS_TARGET_CONF_LOWER)
ExternalProject_Add(v8_build_${MS_TARGET_CONF_LOWER} ExternalProject_Add(v8_build_${MS_TARGET_CONF_LOWER}
BUILD_IN_SOURCE BUILD_IN_SOURCE
TRUE TRUE
@ -341,24 +340,6 @@ elseif (WIN32)
add_dependencies(v8_build v8_build_${MS_TARGET_CONF_LOWER}) add_dependencies(v8_build v8_build_${MS_TARGET_CONF_LOWER})
# in windows we can't solve this via symlinks, so we attempt to guess one of the /I dirs in the build tree:
set(v8_build_include_dir "${CMAKE_CURRENT_BINARY_DIR}/build/${MS_TARGET_CONF_LOWER}/obj/global_intermediate/testing/gtest/include/gtest/")
ExternalProject_Add_Step(v8_build_${MS_TARGET_CONF_LOWER} unfuck_v8
COMMAND ${CMAKE_COMMAND} -E make_directory ${v8_build_include_dir}
DEPENDEES
v8_build_${MS_TARGET_CONF_LOWER}
DEPENDERS
build
)
message("COMMAND ${CMAKE_COMMAND} -E copy ${V8_DIR}/testing/googletest_subrepo/googletest/* ${v8_build_include_dir}/")
ExternalProject_Add_Step(v8_build_${MS_TARGET_CONF_LOWER} unfuck_v8_2
COMMAND ${CMAKE_COMMAND} -E copy ${V8_DIR}/testing/googletest_subrepo/googletest/include/gtest/gtest_prod.h ${v8_build_include_dir}
DEPENDEES
unfuck_v8
DEPENDERS
build
)
# and now ICU... # and now ICU...
ExternalProject_Add_Step(v8_build_${MS_TARGET_CONF_LOWER} icu_build_icui18n ExternalProject_Add_Step(v8_build_${MS_TARGET_CONF_LOWER} icu_build_icui18n