Custom targets wrapping modules and plugins

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c0ce37845f52d622e74fb4c5fcf33b5f00d94b2..4ad16a5a7df7bf5b95a1b047ee439b8277d0a9ff 100644 (file)
--- 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 e0f606eb492fca3b139411d2841c8cb36a09c8eb..d6baa6ec3eff0f025dda340f0211e8569eea8077 100644 (file)
--- 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 a35639255a10ff1e65f96f11941ba16045466db7..69311961958419107edc69cb351888cfba53ab90 100644 (file)
--- 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)