diff --git a/cmake/DeployMacros.cmake b/cmake/DeployMacros.cmake index 6cbeb1b4..b02eef18 100644 --- a/cmake/DeployMacros.cmake +++ b/cmake/DeployMacros.cmake @@ -129,6 +129,10 @@ if (NOT _dep_exists) set(_dep_exists 1) add_custom_target(deploy COMMENT "Deploy") endif() +set(_modules_dir "${CMAKE_ROOT}/Modules") +if (LIBPROJECT) + set(_modules_dir ${PIP_CMAKE_MODULE_PATH}) +endif() macro(set_version _T) @@ -614,7 +618,7 @@ macro(deploy_target _T) set(MACOSX_BUNDLE_BUNDLE_VERSION "6.0") set(MACOSX_BUNDLE_SIGNATURE "????") set_target_properties(${_T} PROPERTIES MACOSX_BUNDLE TRUE) - set_target_properties(${_T} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_ROOT}/Modules/PIMacOSBundle.plist.in") + set_target_properties(${_T} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${_modules_dir}/PIMacOSBundle.plist.in") set(_AGD "${_DEPLOY_DIR}/${_T}.app") set(_DMG "${CMAKE_CURRENT_BINARY_DIR}/dmg") __make_copy(_CMD_ _RES_DIRS _RES_FILES "${_AGD}/Contents/Resources") @@ -740,7 +744,7 @@ macro(deploy_target _T) set(_out_json "${CMAKE_CURRENT_BINARY_DIR}/${_T}_android_deployment_settings.json") configure_file("${CMAKE_BINARY_DIR}/android_deployment_settings.json.in" "${_out_json}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml.in" "${_AGD}/AndroidManifest.xml") - configure_file("${CMAKE_ROOT}/Modules/gradle.properties.in" "${_AGD}/gradle.properties") + configure_file("${_modules_dir}/gradle.properties.in" "${_AGD}/gradle.properties") set(_depstr) foreach (_d ${ANDROID_GRADLE_DEPENDENCIES}) set(_depstr "${_depstr}\n ${_d}")