From 2a996ed9a07c069b5920801c28edfae5cc7106e8 Mon Sep 17 00:00:00 2001 From: Alvoda Date: Mon, 30 Dec 2019 13:11:33 +0100 Subject: [PATCH] build: fixed race condition in cmake for creating symlinks on Linux (#872) --- CMakeLists.txt | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9542a726..92b4afeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -762,22 +762,13 @@ if (UNIX) "${CMAKE_BINARY_DIR}/app/data") execute_process( COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${CMAKE_BINARY_DIR}/app" - COMMAND "${CMAKE_COMMAND}" - "-E" "create_symlink" - "${CMAKE_SOURCE_DIR}/bin/app/data" - "${CMAKE_BINARY_DIR}/app/data" - COMMAND ${CMAKE_COMMAND} - "-E" "make_directory" - "${CMAKE_BINARY_DIR}/test" - COMMAND "${CMAKE_COMMAND}" - "-E" "create_symlink" - "${CMAKE_SOURCE_DIR}/bin/test/data" - "${CMAKE_BINARY_DIR}/test/data" - COMMAND "${CMAKE_COMMAND}" - "-E" "create_symlink" - "${CMAKE_SOURCE_DIR}/bin/app/user" - "${CMAKE_BINARY_DIR}/app/user" - ) + COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${CMAKE_BINARY_DIR}/test" + ) + execute_process( + COMMAND "${CMAKE_COMMAND}" "-E" "create_symlink" "${CMAKE_SOURCE_DIR}/bin/app/data" "${CMAKE_BINARY_DIR}/app/data" + COMMAND "${CMAKE_COMMAND}" "-E" "create_symlink" "${CMAKE_SOURCE_DIR}/bin/app/user" "${CMAKE_BINARY_DIR}/app/user" + COMMAND "${CMAKE_COMMAND}" "-E" "create_symlink" "${CMAKE_SOURCE_DIR}/bin/test/data" "${CMAKE_BINARY_DIR}/test/data" + ) if (UNIX AND NOT APPLE) # Create different sized icons