Skip to content

Commit 77c0aeb

Browse files
authored
boost (#12929)
* "fix ci" * "windows tab" * "fix ci"
1 parent c790d57 commit 77c0aeb

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

cmake/external/boost.cmake

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,36 @@ if((NOT DEFINED BOOST_TAR) OR (NOT DEFINED BOOST_URL))
2828
set(BOOST_TAR "boost_1_41_0" CACHE STRING "" FORCE)
2929
set(BOOST_URL "http://paddlepaddledeps.cdn.bcebos.com/${BOOST_TAR}.tar.gz" CACHE STRING "" FORCE)
3030
endif()
31-
MESSAGE(STATUS "BOOST_TAR: ${BOOST_TAR}, BOOST_URL: ${BOOST_URL}")
31+
IF (WIN32)
32+
MESSAGE(WARNING, "In windows, boost can not be downloaded automaticlly, please build it manually and put it at " ${THIRD_PARTY_PATH}install/boost)
33+
else()
34+
MESSAGE(STATUS "BOOST_TAR: ${BOOST_TAR}, BOOST_URL: ${BOOST_URL}")
35+
ENDIF(WIN32)
36+
3237
set(BOOST_SOURCES_DIR ${THIRD_PARTY_PATH}/boost)
3338
set(BOOST_DOWNLOAD_DIR "${BOOST_SOURCES_DIR}/src/${BOOST_PROJECT}")
3439
set(BOOST_INCLUDE_DIR "${BOOST_DOWNLOAD_DIR}/${BOOST_TAR}" CACHE PATH "boost include directory." FORCE)
3540
set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM 1)
3641

3742
include_directories(${BOOST_INCLUDE_DIR})
3843

44+
if (NOT WIN32)
3945
ExternalProject_Add(
4046
${BOOST_PROJECT}
4147
${EXTERNAL_PROJECT_LOG_ARGS}
4248
DOWNLOAD_DIR ${BOOST_DOWNLOAD_DIR}
4349
DOWNLOAD_COMMAND wget --no-check-certificate ${BOOST_URL} -c -q -O ${BOOST_TAR}.tar.gz
44-
&& tar zxf ${BOOST_TAR}.tar.gz
50+
&& tar zxf ${BOOST_TAR}.tar.gz
4551
DOWNLOAD_NO_PROGRESS 1
4652
PREFIX ${BOOST_SOURCES_DIR}
4753
CONFIGURE_COMMAND ""
4854
BUILD_COMMAND ""
4955
INSTALL_COMMAND ""
5056
UPDATE_COMMAND ""
5157
)
58+
endif(NOT WIN32)
5259

53-
if (${CMAKE_VERSION} VERSION_LESS "3.3.0")
60+
if (${CMAKE_VERSION} VERSION_LESS "3.3.0" OR NOT WIN32)
5461
set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/boost_dummy.c)
5562
file(WRITE ${dummyfile} "const char *dummy = \"${dummyfile}\";")
5663
add_library(boost STATIC ${dummyfile})

0 commit comments

Comments
 (0)