diff --git a/.appveyor.yml b/.appveyor.yml index 6a140060..70d4d921 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,8 +24,6 @@ before_build: - cmake --build . --target ALL_BUILD --config Release build_script: - - cd .. - cd bin - copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll - - cd .. - sh sql_import.sh diff --git a/.travis.yml b/.travis.yml index 8ca1bc43..375d4353 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,5 +38,5 @@ script: - mkdir -p build - cd build - cmake .. && make -j 3 - - cd .. + - cd bin - bash sql_import.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 84342f44..b3f220a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,8 @@ set( CMAKE_MODULE_PATH add_custom_target( copy_runtime_files ALL COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/config ${CMAKE_BINARY_DIR}/bin/config COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/sql ${CMAKE_BINARY_DIR}/bin/sql - COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web ) + COMMAND cmake -E copy_directory ${CMAKE_SOURCE_DIR}/web ${CMAKE_BINARY_DIR}/bin/web + COMMAND cmake -E copy ${CMAKE_SOURCE_DIR}/sql_import.sh ${CMAKE_BINARY_DIR}/bin/sql_import.sh ) ###################################### # Dependencies and compiler settings #