Compare commits

..

No commits in common. "ec3e9f78bae27b2e63ad41e9585cac3c46ee1c37" and "4f7bc0fae1d4af5ae81c063d6908d0d7bb335fb4" have entirely different histories.

2 changed files with 11 additions and 12 deletions

View File

@ -6,13 +6,10 @@ Parts of it based on: https://gist.github.com/HiImJulien/3eb47d7d874fe5483810bd7
## Requirements ## Requirements
- Clang Version >= 10 - Clang Version 10
- Visual Studio Build Tools: https://visualstudio.microsoft.com/downloads/ - Visual Studio Build Tools: https://visualstudio.microsoft.com/downloads/
- The following components are sufficient:
* MSVC v142 - VS 2019 C++-x64/x86-Buildtools (v14.28)
+ Windows 10 SDK (10.0.19041.0)
- Qt5: https://download.qt.io/official_releases/qt - Qt5: https://download.qt.io/official_releases/qt
- again when installing it is sufficient to install msvc version of Qt5
## Instructions Linux ## Instructions Linux
@ -44,12 +41,16 @@ Parts of it based on: https://gist.github.com/HiImJulien/3eb47d7d874fe5483810bd7
- Download and Install Qt5 (MinGW libraries not needed) - Download and Install Qt5 (MinGW libraries not needed)
- Clang 10 (https://releases.llvm.org/download.html) - Clang 10 (https://releases.llvm.org/download.html)
- Install MinGW Make
- Install JetBrains CLion (https://jetbrains.com/clion) - Install JetBrains CLion (https://jetbrains.com/clion)
### Steps ### Steps
- Open project with CLion - Open project
- Adjust Toolchain - Adjust Toolchain
- Choose Visual Studio Toolchain - Go to Toolchain Settings
- Add to the CMake Options: - Remove existing Toolchains
- `-DCMAKE_TOOLCHAIN_FILE=clang_windows_toolchain.cmake` - Add MinGW Toolchain
- Adjust CMake Profiles
- Add `-DCMAKE_TOOLCHAIN_FILE=clang_windows_toolchain.cmake` as CMake
parameters

View File

@ -1,7 +1,7 @@
# Cross toolchain configuration for using clang-cl. # Cross toolchain configuration for using clang-cl.
set(WINSDK_VER "10.0.19041.0") set(WINSDK_VER "10.0.19041.0")
set(QT5_VERSION "5.12.10") set(QT5_VERSION "5.12.20")
if(WIN32) if(WIN32)
set(CMAKE_C_COMPILER "C:/llvm/bin/clang-cl.exe") set(CMAKE_C_COMPILER "C:/llvm/bin/clang-cl.exe")
@ -25,8 +25,6 @@ else()
set(WINSDK_BASE "${PROJECT_SOURCE_DIR}/msvc_build_tools/Kit") set(WINSDK_BASE "${PROJECT_SOURCE_DIR}/msvc_build_tools/Kit")
endif() endif()
message(STATUS "Qt5 Directory: ${QT_INSTALL_PATH}")
set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_VERSION 10.0) set(CMAKE_SYSTEM_VERSION 10.0)
set(CMAKE_SYSTEM_PROCESSOR AMD64) set(CMAKE_SYSTEM_PROCESSOR AMD64)