Compare commits

..

1 Commits

Author SHA1 Message Date
Joakim Skogø Langvand ba03ef6b39 Merge branch 'more-editor-actions' into 'master' 4 weeks ago
  1. 4
      CMakeLists.txt
  2. 10
      docs/install.md
  3. 2
      lib/libclangmm

4
CMakeLists.txt

@ -125,10 +125,6 @@ else()
# Find liblldb with the same version as the version of libclang found # Find liblldb with the same version as the version of libclang found
string(REPLACE libclang liblldb LIBLLDB_LIBRARIES "${LIBCLANG_LIBRARIES}") string(REPLACE libclang liblldb LIBLLDB_LIBRARIES "${LIBCLANG_LIBRARIES}")
set(LIBLLDB_INCLUDE_DIRS ${LIBCLANG_INCLUDE_DIRS}) set(LIBLLDB_INCLUDE_DIRS ${LIBCLANG_INCLUDE_DIRS})
if(NOT EXISTS "${LIBLLDB_LIBRARIES}") # In case lldb has been separated into another package as in homebrew
string(REPLACE llvm lldb LIBLLDB_LIBRARIES "${LIBLLDB_LIBRARIES}")
string(REPLACE llvm lldb LIBLLDB_INCLUDE_DIRS "${LIBCLANG_INCLUDE_DIRS}")
endif()
endif() endif()
if(EXISTS "${LIBLLDB_LIBRARIES}") if(EXISTS "${LIBLLDB_LIBRARIES}")
set(LIBLLDB_FOUND TRUE) set(LIBLLDB_FOUND TRUE)

10
docs/install.md

@ -43,7 +43,7 @@ sudo make install
Install dependencies: Install dependencies:
```sh ```sh
sudo pacman -S git cmake pkg-config make clang lldb gtksourceviewmm boost aspell aspell-en libgit2 ctags gtksourceview3 boost-libs sudo pacman -S git cmake pkg-config make clang lldb gtksourceviewmm boost aspell aspell-en libgit2 ctags
``` ```
Get juCi++ source, compile and install: Get juCi++ source, compile and install:
@ -180,7 +180,13 @@ make install
Install dependencies: Install dependencies:
```sh ```sh
brew install cmake pkg-config boost gtksourceviewmm3 gnome-icon-theme aspell llvm lldb clang-format libgit2 zlib libxml2 universal-ctags brew install cmake pkg-config boost gtksourceviewmm3 gnome-icon-theme aspell llvm clang-format libgit2 zlib libxml2 universal-ctags
```
Mojave users might need to install headers:
```sh
open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
``` ```
Get juCi++ source, compile and install: Get juCi++ source, compile and install:

2
lib/libclangmm

@ -1 +1 @@
Subproject commit 32f5115c5930db69a01150c6dc9a4e709ab9cd31 Subproject commit 8dca5d81af05d5184da92a2ca2ce175b5577de25
Loading…
Cancel
Save