cmake: fix lazy loading issues

Fixes #10402
This commit is contained in:
syl20bnr 2018-02-27 23:31:36 -05:00
parent 9cb48f2403
commit 4fe1600f45

View file

@ -19,11 +19,12 @@
(defun cmake/init-cmake-ide ()
(use-package cmake-ide
:if cmake-enable-cmake-ide-support
:init (spacemacs/add-to-hooks 'cmake-ide--mode-hook '(c-mode-hook
c++-mode-hook))
:config
:commands (cmake-ide-delete-file cmake-ide--mode-hook)
:init
(progn
(cmake-ide-setup)
(dolist (hook '(c-mode-hook c++-mode-hook))
;; append the `cmake-ide--mode-hook' in order to load it last
(add-hook hook 'cmake-ide--mode-hook 'append))
(dolist (mode cmake-modes)
(spacemacs/declare-prefix-for-mode mode "mc" "compile")
(spacemacs/declare-prefix-for-mode mode "mp" "project")
@ -31,7 +32,8 @@
"cc" 'cmake-ide-compile
"pc" 'cmake-ide-run-cmake
"pC" 'cmake-ide-maybe-run-cmake
"pd" 'cmake-ide-delete-file)))))
"pd" 'cmake-ide-delete-file)))
:config (cmake-ide-setup)))
(defun cmake/init-cmake-mode ()
(use-package cmake-mode
@ -43,7 +45,7 @@
(defun cmake/init-helm-ctest ()
(use-package helm-ctest
:config
:init
(dolist (mode cmake-modes)
(spacemacs/set-leader-keys-for-major-mode mode
"pt" 'helm-ctest))))