From: Bjorn Munch Date: June 1 2011 1:24pm Subject: bzr push into mysql-trunk branch (bjorn.munch:3141 to 3142) List-Archive: http://lists.mysql.com/commits/138555 Message-Id: <201106011324.p51DOX5L020156@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3142 Bjorn Munch 2011-06-01 [merge] 12607800 followup modified: cmake/install_layout.cmake 3141 Tor Didriksen 2011-06-01 Bug#11762221 post-push fix: build broken unless HAVE_OPENSSL modified: vio/vio.c === modified file 'cmake/install_layout.cmake' --- a/cmake/install_layout.cmake 2011-06-01 10:16:32 +0000 +++ b/cmake/install_layout.cmake 2011-06-01 13:22:30 +0000 @@ -103,7 +103,7 @@ ENDIF() # just use if(INSTALL_PLUGINTESTDIR). # The plugin must set its own install path for tests # -FILE(GLOB plugin_tests plugin/*/tests) +FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests) # # STANDALONE layout No bundle (reason: useless for push emails).