Mercurial > irccd
changeset 377:cd7270ec6c8e
CMake: general cleanup
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sun, 18 Dec 2016 10:02:59 +0100 |
parents | b61a7d5a9101 |
children | 46e9ecf974a5 |
files | irccd/CMakeLists.txt irccdctl/CMakeLists.txt libcommon/CMakeLists.txt libirccd-js/CMakeLists.txt libirccd-test/CMakeLists.txt libirccd/CMakeLists.txt libirccdctl/CMakeLists.txt |
diffstat | 7 files changed, 100 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/irccd/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/irccd/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -26,12 +26,9 @@ LIBRARIES libirccd $<$<BOOL:${WITH_JS}>:libirccd-js> + $<$<BOOL:${UNIX}>:-pthread> ) if (IRCCD_SYSTEM_MAC) target_compile_options(irccd PRIVATE -Wno-deprecated-declarations) endif () - -if (UNIX) - set_target_properties(irccd PROPERTIES LINK_FLAGS -pthread) -endif ()
--- a/irccdctl/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/irccdctl/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -1,4 +1,5 @@ -# # CMakeLists.txt -- CMake build system for irccd +# +# CMakeLists.txt -- CMake build system for irccd # # Copyright (c) 2013-2016 David Demelier <markand@malikania.fr> # @@ -32,10 +33,4 @@ DESCRIPTION "Irccd controller." SOURCES ${SOURCES} LIBRARIES libirccdctl - INCLUDES ${irccdctl_SOURCE_DIR} ) - -if (UNIX) - set_target_properties(irccdctl PROPERTIES LINK_FLAGS -pthread) -endif () -
--- a/libcommon/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/libcommon/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -1,3 +1,21 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 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. +# + project(libcommon) set(
--- a/libirccd-js/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/libirccd-js/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -1,3 +1,21 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 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. +# + project(libirccd-js) set( @@ -44,7 +62,9 @@ ${libirccd-js_SOURCE_DIR}/CMakeLists.txt ${HEADERS} ${SOURCES} - LIBRARIES extern-duktape libirccd + LIBRARIES + extern-duktape + libirccd PUBLIC_INCLUDES $<BUILD_INTERFACE:${libirccd-js_SOURCE_DIR}/irccd> $<BUILD_INTERFACE:${libirccd-js_SOURCE_DIR}>
--- a/libirccd-test/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/libirccd-test/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -1,3 +1,21 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 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. +# + project(libirccd-test) irccd_define_library( @@ -9,7 +27,10 @@ ${libirccd-test_SOURCE_DIR}/irccd/plugin-tester.hpp ${libirccd-test_SOURCE_DIR}/irccd/server-tester.cpp ${libirccd-test_SOURCE_DIR}/irccd/server-tester.hpp - LIBRARIES libirccd-js libirccdctl extern-gtest + LIBRARIES + libirccd-js + libirccdctl + extern-gtest PUBLIC_INCLUDES $<BUILD_INTERFACE:${libirccd-test_SOURCE_DIR}/irccd> )
--- a/libirccd/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/libirccd/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -1,3 +1,21 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 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. +# + project(libirccd) set(
--- a/libirccdctl/CMakeLists.txt Tue Dec 13 13:04:39 2016 +0100 +++ b/libirccdctl/CMakeLists.txt Sun Dec 18 10:02:59 2016 +0100 @@ -1,3 +1,21 @@ +# +# CMakeLists.txt -- CMake build system for irccd +# +# Copyright (c) 2013-2016 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. +# + project(libirccdctl) set(