diff --git a/DownloadBoost.cmake b/DownloadBoost.cmake index 43952dbfb93e0687e011ac72ba4bddde4b16abd4..fd4704d8896e946e7d6d3f1df1d0d4564b7beb24 100644 --- a/DownloadBoost.cmake +++ b/DownloadBoost.cmake @@ -48,7 +48,7 @@ if(NOT rv STREQUAL "0") endif() execute_process( - COMMAND ${B2_CMD} header + COMMAND ${B2_CMD} headers WORKING_DIRECTORY ${BOOST_LOCAL_PATH} RESULT_VARIABLE rv ) @@ -57,7 +57,7 @@ if(NOT rv STREQUAL "0") endif() execute_process( - COMMAND ${B2_CMD} -q cxxflags=-fPIC --layout=system variant=debug link=${LINK_TYPE} address-model=64 --with-system --with-serialization --with-random + COMMAND ${B2_CMD} -q cxxflags=-fPIC --layout=system variant=debug link=${DEPENDENCIES_LINK_TYPE} address-model=64 --with-system --with-serialization --with-random WORKING_DIRECTORY ${BOOST_LOCAL_PATH} RESULT_VARIABLE rv ) diff --git a/FindBoost.cmake b/FindBoost.cmake index 03f37d5a7a529e1c60eedc78e0def9e0f053ae0e..310932412ce8953b7981b2c6caa2a3ef40347835 100644 --- a/FindBoost.cmake +++ b/FindBoost.cmake @@ -159,7 +159,7 @@ else() # Add every found library as an IMPORTED target string(TOUPPER ${DEPENDENCIES_LINK_TYPE} TMP) string(REGEX REPLACE "^lib" "" TARGET_NAME ${LIBNAME}) - string(REGEX REPLACE "\.[a-z]*$" "" TARGET_NAME ${TARGET_NAME}) + string(REGEX REPLACE "\\.[a-z]*$" "" TARGET_NAME ${TARGET_NAME}) add_library(${TARGET_NAME} ${TMP} IMPORTED) set_target_properties(${TARGET_NAME} PROPERTIES IMPORTED_LOCATION ${${LIBNAME}}) message("Created IMPORTED library target: ${TARGET_NAME}") diff --git a/build.sh b/build.sh index c38d9b18f9403b224b89c6b4401fd2a765b96252..e25792039c945f8b6c7105d64357f846f7c9c23a 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,6 @@ export CLEAN_AFTER=no #./clean.sh cd build_scripts/linux -./download_dependencies.sh export DEPENDENCIES_LINK_TYPE=static ./linux_gcc_build_x64_debug_local.sh cd ../..