Skip to content
Snippets Groups Projects
Commit b6158cd6 authored by Martin Beseda's avatar Martin Beseda
Browse files

FIX: Fixing downloading dependencies by CMake

parent 1c7b4ac4
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ if(NOT rv STREQUAL "0") ...@@ -48,7 +48,7 @@ if(NOT rv STREQUAL "0")
endif() endif()
execute_process( execute_process(
COMMAND ${B2_CMD} header COMMAND ${B2_CMD} headers
WORKING_DIRECTORY ${BOOST_LOCAL_PATH} WORKING_DIRECTORY ${BOOST_LOCAL_PATH}
RESULT_VARIABLE rv RESULT_VARIABLE rv
) )
...@@ -57,7 +57,7 @@ if(NOT rv STREQUAL "0") ...@@ -57,7 +57,7 @@ if(NOT rv STREQUAL "0")
endif() endif()
execute_process( 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} WORKING_DIRECTORY ${BOOST_LOCAL_PATH}
RESULT_VARIABLE rv RESULT_VARIABLE rv
) )
......
...@@ -159,7 +159,7 @@ else() ...@@ -159,7 +159,7 @@ else()
# Add every found library as an IMPORTED target # Add every found library as an IMPORTED target
string(TOUPPER ${DEPENDENCIES_LINK_TYPE} TMP) string(TOUPPER ${DEPENDENCIES_LINK_TYPE} TMP)
string(REGEX REPLACE "^lib" "" TARGET_NAME ${LIBNAME}) 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) add_library(${TARGET_NAME} ${TMP} IMPORTED)
set_target_properties(${TARGET_NAME} PROPERTIES IMPORTED_LOCATION ${${LIBNAME}}) set_target_properties(${TARGET_NAME} PROPERTIES IMPORTED_LOCATION ${${LIBNAME}})
message("Created IMPORTED library target: ${TARGET_NAME}") message("Created IMPORTED library target: ${TARGET_NAME}")
......
...@@ -5,7 +5,6 @@ export CLEAN_AFTER=no ...@@ -5,7 +5,6 @@ export CLEAN_AFTER=no
#./clean.sh #./clean.sh
cd build_scripts/linux cd build_scripts/linux
./download_dependencies.sh
export DEPENDENCIES_LINK_TYPE=static export DEPENDENCIES_LINK_TYPE=static
./linux_gcc_build_x64_debug_local.sh ./linux_gcc_build_x64_debug_local.sh
cd ../.. cd ../..
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment