Mercurial > embed
changeset 72:ce077d93ce14
misc: cleanup
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 18 Jul 2018 13:02:56 +0200 |
parents | 26304c6e4b69 |
children | 46012b0dea51 |
files | fmt/CMakeLists.txt jansson/CMakeLists.txt mstch/CMakeLists.txt pugixml/CMakeLists.txt tests/fmt/main.cpp tests/json/main.cpp vera/CMakeLists.txt |
diffstat | 7 files changed, 16 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/fmt/CMakeLists.txt Wed Jul 18 12:31:28 2018 +0200 +++ b/fmt/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 @@ -1,8 +1,11 @@ +# +# this file was customized it may be different from upstream. +# + cmake_minimum_required(VERSION 3.1.0) project(fmt) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - "${CMAKE_CURRENT_SOURCE_DIR}/support/cmake") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${fmt_SOURCE_DIR}/support/cmake") include(cxx14) include(CheckCXXCompilerFlag) @@ -48,5 +51,6 @@ # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 /lib/libm.so.6. target_link_libraries(libfmt -Wl,--as-needed) endif () + target_compile_definitions(libfmt PRIVATE FMT_EXPORT INTERFACE FMT_SHARED) endif ()
--- a/jansson/CMakeLists.txt Wed Jul 18 12:31:28 2018 +0200 +++ b/jansson/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 @@ -1,29 +1,5 @@ # -# CMakeLists.txt -- CMake build system for jansson -# -# Copyright (c) 2016-2018 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -# -# This CMakeLists has been modified from vanilla jansson source. -# ------------------------------------------------------------------- -# -# - installation stuff has been removed, -# - documentation process has been removed. -# - style has been adapted to match our conventions. -# - comments and unneeded stuff have been removed. +# this file was customized it may be different from upstream. # cmake_minimum_required(VERSION 3.0)
--- a/mstch/CMakeLists.txt Wed Jul 18 12:31:28 2018 +0200 +++ b/mstch/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 @@ -1,3 +1,7 @@ +# +# this file was customized it may be different from upstream. +# + cmake_minimum_required(VERSION 3.0.2) project(mstch) add_subdirectory(src)
--- a/pugixml/CMakeLists.txt Wed Jul 18 12:31:28 2018 +0200 +++ b/pugixml/CMakeLists.txt Wed Jul 18 13:02:56 2018 +0200 @@ -1,5 +1,5 @@ # -# CMakeLists.txt -- CMake build system for hoedown +# CMakeLists.txt -- CMake build system for pugixml # # Copyright (c) 2016-2018 David Demelier <markand@malikania.fr> #
--- a/tests/fmt/main.cpp Wed Jul 18 12:31:28 2018 +0200 +++ b/tests/fmt/main.cpp Wed Jul 18 13:02:56 2018 +0200 @@ -22,4 +22,3 @@ { fmt::format("hello"); } -