List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:June 11 2012 6:31pm
Subject:bzr push into mysql-5.5 branch (joerg.bruehe:3868 to 3869)
View as plain text  
 3869 Joerg Bruehe	2012-06-11
      cmake syntax error: missed ${...}

    modified:
      SPECIFIC-ULN/CMakeLists.txt
 3868 Joerg Bruehe	2012-06-11
      Files in "SPECIFIC-ULN" need to be mentioned in a cmake "INSTALL".

    modified:
      SPECIFIC-ULN/CMakeLists.txt
=== modified file 'SPECIFIC-ULN/CMakeLists.txt'
--- a/SPECIFIC-ULN/CMakeLists.txt	2012-06-11 17:50:03 +0000
+++ b/SPECIFIC-ULN/CMakeLists.txt	2012-06-11 18:30:04 +0000
@@ -24,14 +24,14 @@ IF(UNIX)
   ENDIF()
 
   # Left in current directory, to be taken during build
-  CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/SPECIFIC-ULN/${SPECFILENAME} @ONLY)
+  CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
 
   FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
           mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
           mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
           mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
           mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c)
-    INSTALL(FILES ulnfile DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/SPECIFIC-ULN)
+    INSTALL(FILES ${ulnfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   ENDFOREACH()
 ENDIF()
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (joerg.bruehe:3868 to 3869) Joerg Bruehe12 Jun