Merge branch 'master' of ssh://brodbeck-online.de:60022/martin/kima2-cpp into master
This commit is contained in:
commit
eb5434f374
2 changed files with 5 additions and 3 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
@ -1,9 +1,9 @@
|
|||
[submodule "3rdparty/nlohmann_json"]
|
||||
[submodule "subprojects/nlohmann_json"]
|
||||
path = subprojects/nlohmann_json
|
||||
url = https://github.com/nlohmann/json.git
|
||||
[submodule "3rdparty/singleapplication"]
|
||||
[submodule "subprojects/singleapplication"]
|
||||
path = subprojects/singleapplication/singleapplication.git
|
||||
url = https://github.com/itay-grudev/SingleApplication.git
|
||||
[submodule "3rdparty/csv-parser"]
|
||||
[submodule "subprojects/csv-parser"]
|
||||
path = subprojects/csv-parser
|
||||
url = https://github.com/vincentlaucsb/csv-parser.git
|
||||
|
|
|
@ -109,6 +109,8 @@ if( MINGW )
|
|||
${MINGW_PATH}/libbz2-1.dll
|
||||
${MINGW_PATH}/libintl-8.dll
|
||||
${MINGW_PATH}/libpcre-1.dll
|
||||
${MINGW_PATH}/libdouble-conversion.dll
|
||||
${MINGW_PATH}/libzstd.dll
|
||||
${MINGW_PATH}/libiconv-2.dll)
|
||||
install(FILES ${MINGW_PATH}/../share/qt5/plugins/platforms/qwindows.dll
|
||||
${MINGW_PATH}/../share/qt5/plugins/platforms/qminimal.dll
|
||||
|
|
Loading…
Reference in a new issue