From: Samir Benmendil Date: Mon, 26 Dec 2016 00:50:03 +0000 (+0000) Subject: vim/ultisnips: update cmake X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/79af7287113f5ae8f21d2a516e310746998bbb2c?ds=sidebyside vim/ultisnips: update cmake --- diff --git a/vim/ultisnips/cmake.snippets b/vim/ultisnips/cmake.snippets index afdbef6..1a2db7a 100644 --- a/vim/ultisnips/cmake.snippets +++ b/vim/ultisnips/cmake.snippets @@ -1,23 +1,18 @@ snippet cmake "CMakeFiles Stub" b -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 3.5) project(${1:ProjectName}) -find_package(${2:LIBRARY}) +# find_package(Boost REQUIRED) -include_directories( - ${$2_INCLUDE_DIR} +add_executable(\${PROJECT_NAME} + ${1:main.cpp} ) -add_subdirectory(${0:src}) - -add_executable($1) -set_target_properties($1 - PROPERTIES CXX_STANDARD 11 +set_target_properties(\${PROJECT_NAME} + PROPERTIES CXX_STANDARD 14 ) - -target_link_libraries($1 - ${$2_LIBRARIES} +target_link_libraries(\${PROJECT_NAME} ) endsnippet @@ -30,13 +25,7 @@ set(qt5_modules ) foreach(qt5_module ${qt5_modules}) - find_package(${qt5_module} QUIET) - if(${qt5_module}_FOUND) - - else(${qt5_module}_FOUND) - message(FATAL_ERROR "Qt5 module '${qt5_module}' not found") - endif() - endif() + find_package(${qt5_module} REQUIRED) endforeach() endsnippet @@ -48,8 +37,6 @@ endsnippet snippet find find_package(${0:LIBRARY}) -include_dir($0_INCLUDE_DIRS) -link_directories($0_LIBRARY_DIRS) endsnippet snippet glob @@ -61,13 +48,13 @@ add_subdirectory(${0:src}) endsnippet snippet lib -add_library(${1:lib} ${2:STATIC} +add_library(${1:lib} ${${0:SRCS}} ) endsnippet snippet link -target_link_libraries(${1:bin} +target_link_libraries(\${PROJECT_NAME} ${0:somelib} ) endsnippet @@ -87,8 +74,7 @@ add_dependencies(${1:target} endsnippet snippet props -set_target_properties(${1:target} - ${2:PROPERTIES} ${3:COMPILE_FLAGS} - ${0:"-O3 -Wall -pedantic"} +set_target_properties(${1:target} ${2:PROPERTIES} + ${3:COMPILE_FLAGS} ${0:"-O3 -Wall -pedantic"} ) endsnippet