From 083a08beb83bd1d03044d5348916a5e1e8fde9ed Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 30 Jul 2019 07:02:09 +0200 Subject: [PATCH] Re-ordered and reformatted cmake recipes. --- CMakeLists.txt | 14 +++++++------- src/cli/CMakeLists.txt | 3 ++- src/lib/CMakeLists.txt | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aceea60..41770fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,7 @@ cmake_minimum_required (VERSION 3.2) project(remwharead VERSION 0.6.3 LANGUAGES CXX -) - -set(WITH_MAN "YES" CACHE STRING "WITH_MAN defaults to \"YES\"") -set(WITH_TESTS "NO" CACHE STRING "WITH_TESTS defaults to \"NO\"") -set(WITH_MOZILLA "NO" CACHE STRING "WITH_MOZILLA defaults to \"NO\"") - -include(GNUInstallDirs) + ) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -18,6 +12,12 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wpedantic -ftrapv \ -fsanitize=undefined -g -Og -fno-omit-frame-pointer") +set(WITH_MAN "YES" CACHE STRING "WITH_MAN defaults to \"YES\"") +set(WITH_TESTS "NO" CACHE STRING "WITH_TESTS defaults to \"NO\"") +set(WITH_MOZILLA "NO" CACHE STRING "WITH_MOZILLA defaults to \"NO\"") + +include(GNUInstallDirs) + include_directories(${PROJECT_SOURCE_DIR}/src/lib) Include_directories(${PROJECT_BINARY_DIR}) diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt index 78d78c6..1b543e8 100644 --- a/src/cli/CMakeLists.txt +++ b/src/cli/CMakeLists.txt @@ -4,6 +4,7 @@ file(GLOB sources_cli *.cpp) add_executable(${PROJECT_NAME}-cli ${sources_cli}) target_link_libraries(${PROJECT_NAME}-cli ${PROJECT_NAME}) -set_target_properties(${PROJECT_NAME}-cli PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) +set_target_properties(${PROJECT_NAME}-cli + PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) install(TARGETS ${PROJECT_NAME}-cli DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 7005f94..caa21b5 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -38,5 +38,6 @@ install(FILES ${headers_lib_export} configure_file("${PROJECT_SOURCE_DIR}/remwharead.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/remwharead.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/remwharead.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")