Solve the multiversotests loader library path issue

This commit is contained in:
Fei Gao 2016-09-26 04:54:53 -07:00
Родитель 804d79286d
Коммит c073fb0b17
3 изменённых файлов: 9 добавлений и 7 удалений

Просмотреть файл

@ -796,16 +796,13 @@ ALL+=$(MULTIVERSO_TEST)
MULTIVERSO:
@echo "Build Multiverso lib and unit tests"
@mkdir -p $(dir $@)
@mkdir -p $(SOURCEDIR)/Multiverso/build
@sh $(SOURCEDIR)/../Tools/setup_mv.sh
@sh $(SOURCEDIR)/../Tools/setup_mv.sh $(BUILD_TOP)
$(MULTIVERSO_LIB): MULTIVERSO
@mkdir -p $(dir $@)
@cp $(SOURCEDIR)/Multiverso/build/src/libmultiverso.so $(MULTIVERSO_LIB)
$(MULTIVERSO_TEST): MULTIVERSO
@mkdir -p $(dir $@)
@cp $(SOURCEDIR)/Multiverso/build/Test/unittests/multiverso.ut $(MULTIVERSO_TEST)
endif

@ -1 +1 @@
Subproject commit 304789c3dad1b3a1ac4a06fac79719760f7076d8
Subproject commit 0b99511a7b8d490b4887c5da4b4dec3e56d977db

Просмотреть файл

@ -1,10 +1,15 @@
BUILD_TOP=$1
cd Source/Multiverso/build
cmake -DBoost_NO_BOOST_CMAKE=TRUE \
-DBoost_NO_SYSTEM_PATHS=TRUE \
-DBOOST_ROOT:PATHNAME=/usr/local/boost-1.60.0 \
-DBOOST_LIBRARY_DIRS:FILEPATH=/usr/local/boost-1.60.0/lib \
-DLIBRARY_OUTPUT_PATH=$BUILD_TOP/lib \
-DEXECUTABLE_OUTPUT_PATH=$BUILD_TOP/bin \
..
make -j multiverso
make -j multiverso.ut
make -j multiversotests