xamarin
/
Urho3D
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

For CI - remove old hacks in the build scripts.

This commit is contained in:
Yao Wei Tjong 姚伟忠 2017-07-21 23:13:28 +08:00
Родитель 78643541e4
Коммит 86a03ec62e
2 изменённых файлов: 2 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.bash_helpers.sh
Просмотреть файл

@ -98,8 +98,6 @@ post_cmake() {
fi
elif [ -e "$BUILD"/*.xcodeproj/project.pbxproj ] && perl -v >/dev/null 2>&1; then
echo -- post_cmake: Fix generated Xcode project
# Temporary workaround to fix file references being added into multiple groups warnings (CMake bug https://www.cmake.org/Bug/view.php?id=15272, stil exists in 3.1)
perl -i -pe 'BEGIN {$/=undef} s/(Begin PBXGroup section.*?\/\* Sources \*\/,).*?,/\1/s' "$BUILD"/*.xcodeproj/project.pbxproj
# Speed up build for Debug build configuration by building only active arch (currently this is not doable via CMake generator-expression as it only works for individual target instead of global)
perl -i -pe 'BEGIN {$/=undef} s/(Debug \*\/ = {[^}]+?)SDKROOT/\1ONLY_ACTIVE_ARCH = YES; SDKROOT/s' "$BUILD"/*.xcodeproj/project.pbxproj
# Speed up build for Debug build configuration by skipping dSYM file generation

15
CMake/Modules/UrhoCommon.cmake
Просмотреть файл

@ -695,14 +695,8 @@ else ()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mstackrealign")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign")
else ()
if (DEFINED ENV{TRAVIS})
# TODO: Remove this workaround when Travis CI VM has been migrated to Ubuntu 14.04 LTS
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-tree-slp-vectorize -fno-tree-vectorize")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-tree-slp-vectorize -fno-tree-vectorize")
else ()
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-tree-loop-vectorize -fno-tree-slp-vectorize -fno-tree-vectorize")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-tree-loop-vectorize -fno-tree-slp-vectorize -fno-tree-vectorize")
endif ()
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-tree-loop-vectorize -fno-tree-slp-vectorize -fno-tree-vectorize")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-tree-loop-vectorize -fno-tree-slp-vectorize -fno-tree-vectorize")
endif ()
endif ()
else ()
@ -722,11 +716,6 @@ else ()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
endif ()
# Temporary workaround for Travis CI VM as Ubuntu 12.04 LTS still uses old glibc header files that do not have the necessary patch for Clang to work correctly
# TODO: Remove this workaround when Travis CI VM has been migrated to Ubuntu 14.04 LTS
if (DEFINED ENV{TRAVIS} AND "$ENV{LINUX}")
add_definitions (-D__extern_always_inline=inline)
endif ()
else ()
# GCC-specific
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9.1)