diff --git a/CMakeLists.txt b/CMakeLists.txt index f56c31ae85..3ec1c708f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_SOURCE_DIR}/resources.rcc COMMAND ${CMAKE_COMMAND} -E rm -f ${CMAKE_CURRENT_SOURCE_DIR}/ui/resources.qrc COMMAND go run ${CMAKE_CURRENT_SOURCE_DIR}/ui/generate-rcc.go -source=${CMAKE_CURRENT_SOURCE_DIR}/ui -output=${CMAKE_CURRENT_SOURCE_DIR}/ui/resources.qrc - COMMAND rcc -binary $<$:"-binary --no-compress">$<$:-binary> ${CMAKE_CURRENT_SOURCE_DIR}/ui/resources.qrc ${CMAKE_CURRENT_SOURCE_DIR}/resources/resources.qrc -o ${CMAKE_CURRENT_SOURCE_DIR}/resources.rcc + COMMAND rcc $<$:"-binary --no-compress">$<$:-binary> ${CMAKE_CURRENT_SOURCE_DIR}/ui/resources.qrc ${CMAKE_CURRENT_SOURCE_DIR}/resources/resources.qrc -o ${CMAKE_CURRENT_SOURCE_DIR}/resources.rcc VERBATIM USES_TERMINAL ) diff --git a/README.md b/README.md index a1423fec80..bf6e854a1d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,24 @@ Dev Docs: [https://hackmd.io/@status-desktop/B1naRjxh_/https%3A%2F%2Fhackmd.io%2 # CPP App -Buid&test&run: + +### Setup: +1. conancenter +Execute `conan remote list`. It should return this line among the results. +``` +conancenter: https://center.conan.io [Verify SSL: True] +``` +If it doesnt, consider upgrading conan with `pip install conan --upgrade` and then executing. `conan remote add -i 0 conancenter https://center.conan.io` . See [conan's documentation](https://docs.conan.io/en/latest/uploading_packages/remotes.html#conancenter) for more info. + + +2. conan libstdc++11 +This applies to linux: the default conan profile does not work, since GCC uses the new C++ ABI since version 5.1 and conan, for compatibility purposes uses the old C++ ABI. +Execute this to update the profile: +``` +conan profile update settings.compiler.libcxx=libstdc++11 default +``` + +### Buid & test & run: ``` cd build conan install .. -s build_type=Release --build=missing