From 4fe1600f455d48c19709524bb32c971d82a5526e Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 27 Feb 2018 23:31:36 -0500 Subject: [PATCH] cmake: fix lazy loading issues Fixes #10402 --- layers/+tools/cmake/packages.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/layers/+tools/cmake/packages.el b/layers/+tools/cmake/packages.el index ce9499840..d7c704362 100644 --- a/layers/+tools/cmake/packages.el +++ b/layers/+tools/cmake/packages.el @@ -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))))