diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake index 64f186abb..2f521661b 100644 --- a/platform/linux/linux.cmake +++ b/platform/linux/linux.cmake @@ -182,7 +182,7 @@ target_link_libraries( ) if(MLN_CREATE_AMALGAMATION) - if ("${ARMERGE}" STREQUAL "MLN_CREATE_AMALGAMATION") + if(NOT ARMERGE) message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON") endif() message(STATUS "Found armerge: ${ARMERGE}") @@ -218,7 +218,7 @@ if(MLN_CREATE_AMALGAMATION) add_custom_command( TARGET mbgl-core POST_BUILD - COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a + COMMAND ${ARMERGE} --keep-symbols 'mln.*' --output libmbgl-core-amalgam.a $ $ $ diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index 3fa95286e..5341a94e6 100644 --- a/platform/macos/macos.cmake +++ b/platform/macos/macos.cmake @@ -146,7 +146,7 @@ add_test( find_program(ARMERGE NAMES armerge) if(MLN_CREATE_AMALGAMATION) - if ("${ARMERGE}" STREQUAL "ARMERGE-NOTFOUND") + if(NOT ARMERGE) message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON") endif() message(STATUS "Found armerge: ${ARMERGE}") @@ -161,7 +161,7 @@ if(MLN_CREATE_AMALGAMATION) add_custom_command( TARGET mbgl-core POST_BUILD - COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a + COMMAND ${ARMERGE} --keep-symbols 'mln.*' --output libmbgl-core-amalgam.a $ $ $