Handles more test LABELS.

[apps/app-templates.git] / cmake / cmake.d / 03-macros.cmake

diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 835f7be..c1ed23c 100644 (file)
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -348,11 +348,19 @@ macro(project_targets_populate)
                        if(${T} STREQUAL "LIBRARY")
                                unset(BD)
                                generate_one_populate_target(${IMPPATH} ${PACKAGE_LIBDIR})
+                       elseif(${T} STREQUAL "TEST-LIBRARY")
+                               unset(BD)
+                               generate_one_populate_target(${IMPPATH} ${PACKAGE_TEST_LIBDIR})
                        elseif(${T} STREQUAL "PLUGIN")
                                if(NOT S)
                                        set(S ".ctlso")
                                endif()
                                generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_LIBDIR}/plugins")
+                       elseif(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" AND ${T} STREQUAL "TEST-PLUGIN")
+                               if(NOT S)
+                                       set(S ".ctlso")
+                               endif()
+                               generate_one_populate_target(${P}${OUT}${S} "${PACKAGE_TEST_LIBDIR}/plugins")
                        elseif(${T} STREQUAL "BINDING")
                                if(NOT S)
                                        set(S ".so")
@@ -381,14 +389,26 @@ macro(project_targets_populate)
                                else()
                                        generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_BINDIR})
                                endif()
+                       elseif(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" AND ${T} STREQUAL "TEST-EXECUTABLE")
+                               if(NOT S)
+                                       set(S "")
+                               endif()
+                               if(NOT OUT AND IMPPATH)
+                                       unset(BD)
+                                       generate_one_populate_target(${IMPPATH} ${PACKAGE_TEST_BINDIR})
+                               else()
+                                       generate_one_populate_target(${P}${OUT}${S} ${PACKAGE_TEST_BINDIR})
+                               endif()
                        elseif(${T} STREQUAL "HTDOCS")
                                generate_one_populate_target(${P}${OUT} ${PACKAGE_HTTPDIR})
+                       elseif(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" AND ${T} STREQUAL "TEST-HTDOCS")
+                               generate_one_populate_target(${P}${OUT} ${PACKAGE_HTTPDIR})
                        elseif(${T} STREQUAL "DATA" )
                                generate_one_populate_target(${TARGET} ${PACKAGE_DATADIR})
-                       elseif(${T} STREQUAL "BINDING-CONFIG" )
-                               generate_one_populate_target(${TARGET} ${PACKAGE_ETCDIR})
                        elseif(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" AND ${T} STREQUAL "TEST-DATA")
                                generate_one_populate_target(${TARGET} ${PACKAGE_TEST_DATADIR})
+                       elseif(${T} STREQUAL "BINDING-CONFIG" )
+                               generate_one_populate_target(${TARGET} ${PACKAGE_ETCDIR})
                        elseif(NOT ${CMAKE_BUILD_TYPE} STREQUAL "RELEASE" AND ${T} STREQUAL "TEST-CONFIG")
                                generate_one_populate_target(${TARGET} ${PACKAGE_TEST_ETCDIR})
                        endif()