added qt5 and win support#1
added qt5 and win support#1DmiitriyJarosh wants to merge 38 commits intorobocup-ssl-russia:masterfrom
Conversation
| *.swp | ||
| Thumbs.db | ||
| .idea/* | ||
| cmake-* No newline at end of file |
There was a problem hiding this comment.
Какие конкретно файлы перекрывает эта маска?
There was a problem hiding this comment.
cmake-build-debug
cmake-build-release -- dirs which CLion creates with his cmake. Do you think it will be better to specify only them?
| - cmake .. | ||
| - make | ||
| - sudo make install No newline at end of file | ||
| - sudo make install |
There was a problem hiding this comment.
Таких изменений быть не должно.
| sudo: required | ||
| - os: osx | ||
| osx_image: xcode8 | ||
| osx_image: xcode10 |
There was a problem hiding this comment.
Что не так с предыдущей версией было? Каких библиотек не хватало?
There was a problem hiding this comment.
qt5 wasn't supported, was it?
| find_package(Qt5OpenGL REQUIRED) | ||
| find_package(Qt5Network REQUIRED) | ||
| set(QT_LIBRARIES "") | ||
| macro(qt4_wrap_cpp VARNAME) |
There was a problem hiding this comment.
А зачем это? Не очень понимаю :( и ниже который.
There was a problem hiding this comment.
to add support for both versions with less changes
| list(APPEND DLL_LIB_LIST ${QT5_DEBUG_DLL}) | ||
| endif() | ||
| if (CXX_BIT STREQUAL 64) | ||
| list(APPEND DLL_LIB_LIST ${RES}/libgcc_s_seh-1.dll) |
There was a problem hiding this comment.
Обе возможности протестированы?
| - cd .. | ||
| - set PATH=%MSYS_DIR%\mingw%bit%\bin;%QT_MinGW_DIR%\bin | ||
| - cd vartypes_dir | ||
| - mkdir build-cmake && cd build-cmake |
There was a problem hiding this comment.
А почему часть билдов in-source, а часть out-of-source? Можно как-то унифицировать?
There was a problem hiding this comment.
I have a problem with calling configure for ODE, it is a bash script and i try to find way to run it in cmd? Any ideas?
| @@ -1,14 +1,47 @@ | |||
| cmake_minimum_required(VERSION 2.8) | |||
|
|
|||
| set(USE_QT5 1) | |||
There was a problem hiding this comment.
У cmake должен быть аналог pri файлов в Qt, так называемых include файлов. Туда можно и нужно выносить общие вещи между разными таргетами и просто инклюдить. Давай попробуем.
2 participants
No description provided.