mirror of
https://github.com/MariaDB/server.git
synced 2025-07-10 04:22:00 +03:00
don't install same files twice
CMakeLists.txt - merge mistake, apparently include/CMakeLists.txt - install from CMAKE_CURRENT_BINARY_DIR. Only install from CMAKE_CURRENT_SOURCE_DIR, if it's different from CMAKE_CURRENT_BINARY_DIR mysql-test/CMakeLists.txt - INSTALL_MYSQL_TEST() macro installs everything, no need to install mtr separately once again mysql-test/lib/My/SafeProcess/CMakeLists.txt MYSQL_ADD_EXECUTABLE includes INSTALL sql-bench/CMakeLists.txt list files explicitly. don't install garbage, don't process 'foo' and 'foo.sh' separately, it's only one file to install, not two.
This commit is contained in:
@ -460,7 +460,6 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
|
||||
# ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
|
||||
|
||||
IF(UNIX)
|
||||
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
|
||||
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
|
||||
ENDIF()
|
||||
|
||||
|
@ -73,14 +73,17 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
|
||||
STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
|
||||
STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
|
||||
|
||||
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
PATTERN CMakeFiles EXCLUDE
|
||||
PATTERN mysql EXCLUDE
|
||||
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
|
||||
MACRO(INSTALL_PRIVATE DIR)
|
||||
INSTALL(DIRECTORY ${DIR}/.
|
||||
DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
PATTERN CMakeFiles EXCLUDE
|
||||
PATTERN mysql EXCLUDE
|
||||
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
|
||||
ENDMACRO()
|
||||
|
||||
INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
|
||||
IF(NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
INSTALL_PRIVATE(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
ENDIF()
|
||||
|
||||
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
PATTERN CMakeFiles EXCLUDE
|
||||
PATTERN mysql EXCLUDE
|
||||
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
|
||||
|
@ -32,12 +32,6 @@ IF(UNIX)
|
||||
./mysql-test-run.pl mysql-test-run
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
IF(INSTALL_MYSQLTESTDIR)
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mtr
|
||||
${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run
|
||||
DESTINATION ${INSTALL_MYSQLTESTDIR}
|
||||
COMPONENT Test)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(CMAKE_GENERATOR MATCHES "Visual Studio")
|
||||
|
@ -29,16 +29,6 @@ ELSE()
|
||||
MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS})
|
||||
ENDIF()
|
||||
|
||||
INSTALL(TARGETS my_safe_process
|
||||
DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
INSTALL(TARGETS my_safe_kill
|
||||
DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
INSTALL(FILES Base.pm
|
||||
DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
|
||||
)
|
||||
|
@ -34,38 +34,44 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Data/Wisconsin
|
||||
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/limits
|
||||
DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
|
||||
|
||||
FILE(GLOB all_files ${CMAKE_CURRENT_SOURCE_DIR}/*)
|
||||
SET(all_files README bench-count-distinct.sh bench-init.pl.sh
|
||||
compare-results.sh copy-db.sh crash-me.sh example.bat
|
||||
graph-compare-results.sh innotest1.sh innotest1a.sh innotest1b.sh
|
||||
innotest2.sh innotest2a.sh innotest2b.sh myisam.cnf pwd.bat
|
||||
run-all-tests.sh server-cfg.sh test-ATIS.sh test-alter-table.sh
|
||||
test-big-tables.sh test-connect.sh test-create.sh test-insert.sh
|
||||
test-select.sh test-table-elimination.sh test-transactions.sh
|
||||
test-wisconsin.sh uname.bat
|
||||
)
|
||||
|
||||
FOREACH(file ${all_files})
|
||||
IF(NOT IS_DIRECTORY ${file} AND NOT ${file} MATCHES "Make|as3ap|/example$" )
|
||||
GET_FILENAME_COMPONENT(ext ${file} EXT)
|
||||
GET_FILENAME_COMPONENT(name ${file} NAME)
|
||||
SET(target ${name})
|
||||
IF(ext MATCHES ".sh$")
|
||||
# Those are perl files actually
|
||||
STRING(REPLACE ".sh" "" target ${target} )
|
||||
IF(WIN32)
|
||||
IF(NOT ext MATCHES ".pl")
|
||||
SET(target "${target}.pl")
|
||||
ENDIF()
|
||||
GET_FILENAME_COMPONENT(ext ${file} EXT)
|
||||
GET_FILENAME_COMPONENT(name ${file} NAME)
|
||||
SET(target ${name})
|
||||
IF(ext MATCHES ".sh$")
|
||||
# Those are perl files actually
|
||||
STRING(REPLACE ".sh" "" target ${target} )
|
||||
IF(WIN32)
|
||||
IF(NOT ext MATCHES ".pl")
|
||||
SET(target "${target}.pl")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
SET(target "${CMAKE_CURRENT_BINARY_DIR}/${target}")
|
||||
CONFIGURE_FILE(${file} ${target} COPYONLY)
|
||||
IF (UNIX AND NOT ${name} MATCHES "README")
|
||||
EXECUTE_PROCESS(COMMAND chmod +x ${target})
|
||||
ENDIF()
|
||||
IF (ext MATCHES ".bat")
|
||||
IF(WIN32)
|
||||
INSTALL(PROGRAMS ${target}
|
||||
DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
|
||||
ENDIF()
|
||||
ELSEIF(name MATCHES "README")
|
||||
INSTALL(FILES ${target}
|
||||
DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
|
||||
ELSE()
|
||||
ENDIF()
|
||||
SET(target "${CMAKE_CURRENT_BINARY_DIR}/${target}")
|
||||
CONFIGURE_FILE(${file} ${target} COPYONLY)
|
||||
IF (UNIX AND NOT ${name} MATCHES "README")
|
||||
EXECUTE_PROCESS(COMMAND chmod +x ${target})
|
||||
ENDIF()
|
||||
IF (ext MATCHES ".bat")
|
||||
IF(WIN32)
|
||||
INSTALL(PROGRAMS ${target}
|
||||
DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
|
||||
ENDIF()
|
||||
ELSEIF(name MATCHES "README")
|
||||
INSTALL(FILES ${target}
|
||||
DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
|
||||
ELSE()
|
||||
INSTALL(PROGRAMS ${target}
|
||||
DESTINATION ${prefix}sql-bench COMPONENT SqlBench)
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
|
Reference in New Issue
Block a user