Browse Source

Minor cleanup of cmake files

pipelines/143601543
eidheim 6 years ago
parent
commit
4ef4e16ecf
  1. 12
      CMakeLists.txt
  2. 2
      share/cmake_modules/FindPlantuml.cmake

12
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)

2
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()

Loading…
Cancel
Save