CMake fixup: export C++ ABI settings for test suite to grab, and get …

…boost from zipfile for better portability
dyninst · Mar 14, 2017 · 19b90bc · 19b90bc
1 parent 823ff23
commit 19b90bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmake/DyninstConfig.cmake.in b/cmake/DyninstConfig.cmake.in
@@ -21,6 +21,7 @@ set (DYNINST_LIBRARIES "dyninstAPI")
 # Other variables Dyninst mutators may depend on
 set (DYNINST_PLATFORM "@PLATFORM@")
 set (DYNINST_INTERNAL_DEFINES @UNIFIED_DEFINES@)
+set (USE_CXX11_ABI "@USE_CXX11_ABI@")
 
 if(DYNINST_FIND_COMPONENTS)
   foreach(COMP DYNINST_FIND_COMPONENTS)

diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -167,9 +167,9 @@ if(NOT Boost_FOUND)
   include(ExternalProject)
   ExternalProject_Add(boost
     PREFIX ${CMAKE_BINARY_DIR}/boost
-    URL http://downloads.sourceforge.net/project/boost/boost/1.61.0/boost_1_61_0.7z
-    URL_MD5 bb1dad35ad069e8d7c8516209a51053c
-    BUILD_IN_SOURCE 1
+    URL http://downloads.sourceforge.net/project/boost/boost/1.61.0/boost_1_61_0.zip
+    URL_MD5 015ae4afa6f3e597232bfe1dab949ace
+          BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${BOOST_BOOTSTRAP} --prefix=${CMAKE_INSTALL_PREFIX}
     BUILD_COMMAND ${BOOST_BUILD} ${BOOST_ARGS} stage
     INSTALL_COMMAND ""