From 4ef4e16ecf8ef2cb72d4a9f5578ef4277dd53097 Mon Sep 17 00:00:00 2001 From: eidheim Date: Wed, 6 May 2020 09:20:32 +0200 Subject: [PATCH] Minor cleanup of cmake files --- CMakeLists.txt | 12 ++++++------ share/cmake_modules/FindPlantuml.cmake | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56f706e..4389b88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,11 +47,6 @@ option(BUILD_TESTING "Build tests") option(LIBCLANG_PATH "Use custom path for libclang") option(LIBLLDB_PATH "Use custom path for liblldb") -set(BUILD_TESTING_SAVED ${BUILD_TESTING}) -set(BUILD_TESTING OFF CACHE BOOL "Disable sub-project tests" FORCE) -add_subdirectory(lib/tiny-process-library) -set(BUILD_TESTING ${BUILD_TESTING_SAVED} CACHE BOOL "Set to previous value" FORCE) - find_package(Boost 1.54 COMPONENTS REQUIRED filesystem serialization) find_package(ASPELL REQUIRED) include(FindPkgConfig) @@ -73,7 +68,12 @@ else() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/libclangmm/cmake_modules/") find_package(LibClang REQUIRED) endif() -add_subdirectory(lib/libclangmm/src) + +set(BUILD_TESTING_SAVED ${BUILD_TESTING}) +set(BUILD_TESTING OFF CACHE BOOL "Disable sub-project tests" FORCE) +add_subdirectory(lib/tiny-process-library) +add_subdirectory(lib/libclangmm) +set(BUILD_TESTING ${BUILD_TESTING_SAVED} CACHE BOOL "Set to previous value" FORCE) if(LIBLLDB_PATH) find_library(LIBLLDB_LIBRARIES lldb "${LIBLLDB_PATH}/lib" NO_DEFAULT_PATH) diff --git a/share/cmake_modules/FindPlantuml.cmake b/share/cmake_modules/FindPlantuml.cmake index 2063e34..65e19cd 100644 --- a/share/cmake_modules/FindPlantuml.cmake +++ b/share/cmake_modules/FindPlantuml.cmake @@ -5,5 +5,5 @@ if(NOT DEFINED plantuml_FOUND) ) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( - plantuml DEFAULT_MSG PLANTUML_JARFILE) + Plantuml DEFAULT_MSG PLANTUML_JARFILE) endif()