diff options
| author | Gabriele Bozzola <sbozzolator@gmail.com> | 2020-05-03 22:44:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 22:44:07 -0700 |
| commit | 8f00dc90abbdb101b94bf63f9b1cb0ac9a147f40 (patch) | |
| tree | f965e4c11cb397d4a97909f054df7ed2b9916035 | |
| parent | 8de80d7415b413c308f51dfb987ca451b144f3b1 (diff) | |
| parent | 887b01adadb86e909f4e3d0de014c3dcb2626e5a (diff) | |
Merge pull request #293 from condy0919/master
Automatic detection for system libvterm first
| -rw-r--r-- | CMakeLists.txt | 19 | ||||
| -rw-r--r-- | README.md | 12 |
2 files changed, 19 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d46340c..42502e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,17 +24,24 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) endif() # Look for the header file. -option(USE_SYSTEM_LIBVTERM "Use system libvterm instead of the vendored version." OFF) +option(USE_SYSTEM_LIBVTERM "Use system libvterm instead of the vendored version." ON) -if(USE_SYSTEM_LIBVTERM) - find_path(LIBVTERM_INCLUDE_DIR NAMES - vterm.h +# Try to find the libvterm in system. +if (USE_SYSTEM_LIBVTERM) + # try to find the vterm.h header file. + find_path(LIBVTERM_INCLUDE_DIR + NAMES vterm.h ) - if(NOT LIBVTERM_INCLUDE_DIR) - message(FATAL_ERROR "vterm.h not found") + # vterm.h is found. + if (LIBVTERM_INCLUDE_DIR) + message(STATUS "System libvterm detected") + else() + message(STATUS "System libvterm not found: libvterm will be downloaded and compiled as part of the build process") endif() +endif() +if (LIBVTERM_INCLUDE_DIR) find_library(LIBVTERM_LIBRARY NAMES vterm libvterm @@ -64,12 +64,12 @@ Clone the repository: git clone https://github.com/akermu/emacs-libvterm.git ``` -In case you want to use the version of libvterm already installed on your -system, change `cmake ..` with `cmake -DUSE_SYSTEM_LIBVTERM=yes ..` in the -following instructions. If `-DUSE_SYSTEM_LIBVTERM` is not explicitly set to -`yes` (or if it is set to `no`), emacs-libvterm will download the latest version -available of libvterm (from [here](https://github.com/neovim/libvterm)), compile -it, and use it. +By default, vterm will try to find if libvterm is installed. If it is not found, +emacs-libvterm will download the latest version available of libvterm (from +[here](https://github.com/neovim/libvterm)), compile it, and use it. If you +always want to use the vendored version as opposed to the one on you system, set +`USE_SYSTEM_LIBVTERM` to `Off`. To do this, change `cmake ..` with `cmake +-DUSE_SYSTEM_LIBVTERM=Off ..` in the following instructions. Build the module with: |