From 1ef9924accbc7262981159d50af52364044111af Mon Sep 17 00:00:00 2001 From: Mattia Basaglia Date: Wed, 29 Jul 2015 09:32:03 +0200 Subject: [PATCH] Custom targets wrapping modules and plugins --- CMakeLists.txt | 5 ----- contrib/CMakeLists.txt | 7 +++++++ plugins/CMakeLists.txt | 7 +++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c0ce378..4ad16a5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,11 +164,6 @@ set(INCLUDELIST add_subdirectory(libs) -macro(radiant_plugin name) - message(STATUS "Found Plugin ${name}") - add_library(${name} MODULE ${ARGN}) -endmacro() - add_subdirectory(contrib) add_subdirectory(plugins) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index e0f606eb..d6baa6ec 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -9,6 +9,13 @@ include_directories(${LIBXML2_INCLUDE_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins") +add_custom_target(plugins) +macro(radiant_plugin name) + message(STATUS "Found Plugin ${name}") + add_library(${name} MODULE ${ARGN}) + add_dependencies(plugins ${name}) +endmacro() + # add_subdirectory(bkgrnd2d) add_subdirectory(bobtoolz) add_subdirectory(brushexport) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index a3563925..69311961 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -9,6 +9,13 @@ include_directories(${LIBXML2_INCLUDE_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/modules") +add_custom_target(modules) +macro(radiant_plugin name) + message(STATUS "Found Module ${name}") + add_library(${name} MODULE ${ARGN}) + add_dependencies(modules ${name}) +endmacro() + add_subdirectory(archivepak) add_subdirectory(archivewad) add_subdirectory(archivezip) -- 2.39.2