From 40ee4028e00f16d87e62a347bc8a265cc9e29a7c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 9 Feb 2017 12:24:56 +0100 Subject: [PATCH] Fix creation of shortcut to linphone.exe when building on Windows. --- cmake_builder/additional_steps.cmake | 2 +- submodules/cmake-builder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_builder/additional_steps.cmake b/cmake_builder/additional_steps.cmake index f11170c21..4db83c31d 100644 --- a/cmake_builder/additional_steps.cmake +++ b/cmake_builder/additional_steps.cmake @@ -25,7 +25,7 @@ if(LINPHONE_BUILDER_TARGET STREQUAL linphoneqt AND WIN32) set(SHORTCUT_PATH "${CMAKE_INSTALL_PREFIX}/linphone.lnk") set(SHORTCUT_TARGET_PATH "${CMAKE_INSTALL_PREFIX}/bin/linphone.exe") set(SHORTCUT_WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/linphone_package/winshortcut.vbs.in" "${CMAKE_CURRENT_BINARY_DIR}/winshortcut.vbs" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/linphone_package/winshortcut.vbs.in" "${CMAKE_CURRENT_BINARY_DIR}/winshortcut.vbs" @ONLY) add_custom_command(OUTPUT "${SHORTCUT_PATH}" COMMAND "cscript" "${CMAKE_CURRENT_BINARY_DIR}/winshortcut.vbs") add_custom_target(linphoneqt_winshortcut ALL DEPENDS "${SHORTCUT_PATH}" TARGET_linphone_builder) endif() diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 29ed124fd..a79e2826e 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 29ed124fdda3dbdc1a9bdaecd93949b460261a85 +Subproject commit a79e2826e056cc48b3b4d0eda4f38d82f124bb56