Set boost lib layout to system--we're building one set of static libs…

… to link in invisibly, and they should match the Dyninst toolchain.
dyninst · Oct 31, 2016 · 171e651 · 171e651
1 parent 1ae7788
commit 171e651
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -144,7 +144,8 @@ if(NOT Boost_FOUND)
   if(WIN32)
     set(BOOST_BOOTSTRAP call bootstrap.bat)
     set(BOOST_BASE boost/src/Boost)
-    list(APPEND BOOST_ARGS --layout=versioned)
+    list(APPEND BOOST_ARGS --layout=system)
+    set(BOOST_LIB_PREFIX lib)
   else()
     set(BOOST_BOOTSTRAP "./bootstrap.sh")
     set(BOOST_BASE boost/src/boost)
@@ -170,7 +171,7 @@ if(NOT Boost_FOUND)
     )
   set(Boost_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${BOOST_BASE})
   set(Boost_LIBRARY_DIRS ${CMAKE_BINARY_DIR}/${BOOST_BASE}/stage/lib)
-  set(Boost_LIBRARIES boost_thread boost_system)
+  set(Boost_LIBRARIES ${BOOST_LIB_PREFIX}boost_thread ${BOOST_LIB_PREFIX}boost_system ${BOOST_LIB_PREFIX}boost_date_time)
 endif()
 
 link_directories ( ${Boost_LIBRARY_DIRS} )