ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Updated to Qt 5.9.1

Browse Source
This commit is contained in:
Eberhard Graether
2017-07-19 12:23:21 +02:00
parent c6c49b2d45
commit 48811959fd
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+8 -4
View File
@@ -5,7 +5,7 @@
#### External Software
* JDK 1.8
* QT 5.8
* QT 5.9.1
* CxxTest 4.3
* Valgrind 3.9.0 (linux)
* Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
@@ -22,11 +22,11 @@ also something about java, but who knows...
* BOTAN_DIR - .../Botan-2.1.0
For MacOS and Linux
* QT_DIR - .../Qt/Qt5.8.0/5.8/<IDE>
* QT_DIR - .../Qt/Qt5.9.1/5.9.1/<IDE>
For Windows:
* QT_WIN32_DIR - .../Qt/Qt5.8.0/win32/5.8/msvc2015<IDE>
* QT_WIN64_DIR - .../Qt/Qt5.8.0/win64/5.8/msvc2015_64<IDE>
* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015<IDE>
* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64<IDE>
* VLD_DIR - .../Visual Leak Detector
* path
- apped path to git.exe
@@ -44,6 +44,10 @@ Execute Cmake twice (once for each target compiler (32 and 64 bit)). Set the res
For Windows:
Build the Boost libs for 32 and 64 bit. Make sure that the platform specific libs are located in ${BOOST_DIR}/lib32-msvc-14 and ${BOOST_DIR}/lib64-msvc-14.
For Mac:
$ ./bootstrap.sh --with-libraries=filesystem,program_options,system,date_time
$ ./b2 --link=static --variant=release --threading=multi --runtime-link=static --cxxflags=-fPIC
##### Botan setup
For Windows
setup/MacOSX/bundle_install.sh.in
+3 -3
View File
@@ -88,14 +88,14 @@ sed -i '' -e 's/PlugIns/Plugins/g' $RES_DIR/qt.conf
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/./lib" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/lib" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_59_0/stage/lib" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_64_0/stage/lib" $APP_PATH
install_name_tool -delete_rpath "@executable_path/../Frameworks" $APP_PATH
install_name_tool -add_rpath "@loader_path/../Frameworks" $APP_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/./lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/clang-llvm/build_release/lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_59_0/stage/lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/Qt/5.8/clang_64/lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/boost_1_64_0/stage/lib" $INDEXER_PATH
install_name_tool -delete_rpath "/Users/ebsi/Documents/Qt/5.9.1/clang_64/lib" $INDEXER_PATH
install_name_tool -add_rpath "@loader_path/../Frameworks" $INDEXER_PATH
echo -e $INFO "App dependencies"