gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改MAKEFLAGS定义的位置，由travis.sh变更为CMakeLists.txt中。

Browse Source
This commit is contained in:
Lu Qiuwen
2018-09-23 21:13:28 +08:00
parent 37170b060e
commit 54fc6e181e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci/travis.sh
View File

@@ -18,11 +18,6 @@ if [ $NPROCESSORS -gt 4 ] ; then
echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4." echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
NPROCESSORS=4 NPROCESSORS=4
fi fi
# Tell make to use the processors. No preceding '-' required.
MAKEFLAGS="j${NPROCESSORS}"
export MAKEFLAGS
env | sort
# Set default values to OFF for these variables if not specified. # Set default values to OFF for these variables if not specified.
: "${NO_EXCEPTION:=OFF}" : "${NO_EXCEPTION:=OFF}"
@@ -35,6 +30,7 @@ export BUILD_TYPE=Debug
cmake -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ cmake -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DTFE_BUILD_NPROCESSORS=$NPROCESSORS \
.. ..
make make
CTEST_OUTPUT_ON_FAILURE=1 make test CTEST_OUTPUT_ON_FAILURE=1 make test

11
vendor/CMakeLists.txt vendored
View File

@@ -2,13 +2,18 @@
include(ExternalProject) include(ExternalProject)
# NPROCESSOR, set by travis.sh
if(TFE_BUILD_NPROCESSORS)
set(ENV{MAKEFLAGS} "j${TFE_BUILD_NPROCESSORS}")
endif()
### OpenSSL 1.1.0h ### OpenSSL 1.1.0h
ExternalProject_Add(OpenSSL PREFIX openssl ExternalProject_Add(OpenSSL PREFIX openssl
URL ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.0h.tar.gz URL ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.0h.tar.gz
URL_MD5 5271477e4d93f4ea032b665ef095ff24 URL_MD5 5271477e4d93f4ea032b665ef095ff24
CONFIGURE_COMMAND ./Configure linux-x86_64 --prefix=<INSTALL_DIR> --openssldir=<INSTALL_DIR>/lib/ssl CONFIGURE_COMMAND ./Configure linux-x86_64 --prefix=<INSTALL_DIR> --openssldir=<INSTALL_DIR>/lib/ssl
no-weak-ssl-ciphers enable-ec_nistp_64_gcc_128 no-shared no-weak-ssl-ciphers enable-ec_nistp_64_gcc_128 no-shared
BUILD_COMMAND make -j1 BUILD_COMMAND ${MAKE_COMMAND}
INSTALL_COMMAND make install_sw INSTALL_COMMAND make install_sw
BUILD_IN_SOURCE 1) BUILD_IN_SOURCE 1)
@@ -196,3 +201,7 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
add_library(ctemplate-static STATIC IMPORTED GLOBAL) add_library(ctemplate-static STATIC IMPORTED GLOBAL)
set_property(TARGET ctemplate-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libctemplate.a) set_property(TARGET ctemplate-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libctemplate.a)
set_property(TARGET ctemplate-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include) set_property(TARGET ctemplate-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
if(TFE_BUILD_NPROCESSORS)
set(ENV{MAKEFLAGS} "")
endif()