diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-10-24 17:06:43 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-10-24 17:06:43 +0200 |
| commit | 59f38e9190cb1993acce1dfa309f7673d9b935da (patch) | |
| tree | 751f50b03a9327d272068e90a041d690b1422fac /cmake | |
| parent | 5b69caf43cdd17cb0f729016a85fe4196dd1c5f2 (diff) | |
| download | mariadb-git-59f38e9190cb1993acce1dfa309f7673d9b935da.tar.gz | |
Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGIN
Part three:
Fix some search paths.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 5 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 036164d868b..18c7afd8037 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -104,7 +104,10 @@ ENDIF() # just use if(INSTALL_PLUGINTESTDIR). # The plugin must set its own install path for tests # -FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests) +FILE(GLOB plugin_tests + ${CMAKE_SOURCE_DIR}/plugin/*/tests + ${CMAKE_SOURCE_DIR}/internal/plugin/*/tests +) # # STANDALONE layout diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index e3e3c584d47..9736887bb7e 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -39,6 +39,7 @@ MACRO(PLUGIN_APPEND_COLLECTIONS plugin) GET_FILENAME_COMPONENT(fname ${cfile} NAME) FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}") FILE(APPEND ${fcopied} "${fname}\n") + MESSAGE(STATUS "Appended ${cfile}") ENDFOREACH() ENDIF() ENDMACRO() |