diff --git a/build/osx/Info.plist.in b/build/osx/Info.plist.in index 7bd2d43774321cb66c05a894e589bc3c056b6826..f8d5ac7da293b39b763057c87579341e2f8e7280 100644 --- a/build/osx/Info.plist.in +++ b/build/osx/Info.plist.in @@ -14,9 +14,9 @@ <key>CFBundleIdentifier</key> <string>${MACOSX_FRAMEWORK_IDENTIFIER}</string> <key>LSMinimumSystemVersion</key> - <string>${MIN_OS}</string> + <string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string> <key>MinimumOSVersion</key> - <string>${MIN_OS}</string> + <string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleLongVersionString</key> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 21af77fa4b9e8127ca9f89cf631ba9b1225ab896..f741142c86b45d92de43d4760757e37052c66355 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -711,12 +711,6 @@ if(BUILD_SHARED_LIBS) endif() target_compile_definitions(liblinphone PRIVATE "-DLINPHONE_EXPORTS") if(APPLE) - if(IOS) - set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET}) - else() - set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET}) - endif() - set_source_files_properties(${LINPHONE_ROOT_HEADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Headers/") set_source_files_properties(${LINPHONE_C_API_HEADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Headers/api") set_source_files_properties(${LINPHONE_ENUMS_HEADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Headers/enums") @@ -730,7 +724,6 @@ if(BUILD_SHARED_LIBS) PUBLIC_HEADER "${one_header_file}" ) endif() - if(WIN32) # Export Xerces and Soci symbols. if(ENABLE_DB_STORAGE) diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index 0d1d56b01678b8c9a334b79b5955f5e23889bfc4..4b66c9e11cedd43947ad3b9e922c5142acb15e5e 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -433,12 +433,6 @@ if(ANDROID OR IOS) target_link_libraries(linphonetester ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER}) #TODO: replace by if(APPLE) when we want to make apple framework on linphone-desktop too if(IOS) - if(IOS) - set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET}) - else() - set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET}) - endif() - set_target_properties(linphonetester PROPERTIES FRAMEWORK TRUE MACOSX_FRAMEWORK_IDENTIFIER com.belledonne-communications.linphonetester