From df75c6c3d53cc59598a0a524e10c88314dee575e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 27 Jun 2016 17:56:42 +0200 Subject: [PATCH] IOS build was probably broken by my last commit, fix things here. --- tester/CMakeLists.txt | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index 841450d82..b4ffce530 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -119,15 +119,19 @@ set(VCARD_FILES vcards/vcards.vcf ) -set(RESOURCES_FILES +set(OTHER_FILES tester_hosts messages.db - ${SOUND_FILES} - ${SIPP_FILES} - ${CERTIFICATE_FILES} - ${RC_FILES} - ${IMAGE_FILES} - ${VCARD_FILES} +) + +set(IOS_RESOURCES_FILES + ${OTHER_FILES} + certificates + images + rcfiles + sipp + sounds + vcards ) set(SOURCE_FILES_C @@ -244,9 +248,9 @@ endif() # on iOS though, we also build the exectuable so that one can compile it from Xcode and run it directly if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if (IOS) - set_source_files_properties(${RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - add_executable(liblinphone_tester MACOSX_BUNDLE ${RESOURCES_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC}) + if(IOS) + set_source_files_properties(${IOS_RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + add_executable(liblinphone_tester MACOSX_BUNDLE ${IOS_RESOURCES_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC}) set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") else() add_executable(liblinphone_tester ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC})