optional dbus

open-license-manager

2014-10-16 d5cfca5d6eae5fdc99f04e50c19b12e1803ca90b

 build/modules/add_boost.cmake

@@ -100,10 +100,10 @@
   if(NOT EXISTS ${ZipFilePath})

     message(STATUS "Downloading boost ${BoostVersion} to ${BoostCacheDir}")

   endif()

    #SHOW_PROGRESS

   file(DOWNLOAD http://sourceforge.net/projects/boost/files/boost/${BoostVersion}/${BoostFolderName}.tar.bz2/download

       ${ZipFilePath}

       STATUS Status

       SHOW_PROGRESS

       EXPECTED_HASH SHA1=${BoostSHA1}

       )



@@ -158,7 +158,6 @@
   endif()

   execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${BOOST_ROOT}/Build)



	
   #ADD_BOOST_STATIC_RUNTIME is a parsed function parameter

   if(ADD_BOOST_STATIC_RUNTIME)

      set(RUNTIME_LINK "static")

@@ -259,10 +258,13 @@
     else(MSVC)

         set(OUTPUT_FILE ${BOOST_ROOT}/stage/lib/libboost_${libName}-mt${BOOST_LIB_SUFFIX}.${LINUX_LIB_EXTENSION})

     endif(MSVC)

     if(NOT EXISTS "${OUTPUT_FILE}")

        message(STATUS "Building ${Component}")

        execute_process(COMMAND ${b2Args} --with-${Component} WORKING_DIRECTORY ${BOOST_ROOT})

     endif()

     #if(NOT EXISTS "${OUTPUT_FILE}")

        message(STATUS "Building ${Component}: ${b2Args}")

        execute_process(COMMAND ${b2Args} --with-${Component} WORKING_DIRECTORY ${BOOST_ROOT} RESULT_VARIABLE Result OUTPUT_VARIABLE Output ERROR_VARIABLE Error)

        if(NOT Result EQUAL 0)

         message(ERROR "Failed running ${b2Args} --with-${Component}:\n${Output}\n${Error}\n")

        endif()

     #endif()

   endforeach()