all repos — mgba @ 4d00f988e8c6640ef4026439e6466f6c8c2de014

mGBA Game Boy Advance Emulator

CMake: Fix CPack dependencies for libpng 1.6
Vicki Pfau vi@endrift.com
Sat, 16 Sep 2017 10:00:09 -0700
commit

4d00f988e8c6640ef4026439e6466f6c8c2de014

parent

91c807ff81496ce643a0662299d37813d1c469dc

2 files changed, 11 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -27,6 +27,7 @@ Misc:

- Qt: Don't rebuild library view if style hasn't changed - SDL: Fix 2.0.5 build on macOS under some circumstances - GBA: Detect hardware for Pokémon FireRed ROM hacks + - CMake: Fix CPack dependencies for libpng 1.6 0.6.0: (2017-07-16) Features:
M CMakeLists.txtCMakeLists.txt

@@ -122,6 +122,7 @@ string(TOUPPER ${REQUIRE} UREQUIRE)

set(${UREQUIRE}_CFLAGS_OTHER ${${REQUIRE}_CFLAGS_OTHER} PARENT_SCOPE) set(${UREQUIRE}_FOUND ${${REQUIRE}_FOUND} PARENT_SCOPE) set(${UREQUIRE}_INCLUDE_DIRS ${${REQUIRE}_INCLUDE_DIRS} PARENT_SCOPE) + set(${UREQUIRE}_VERSION_STRING ${${REQUIRE}_VERSION_STRING} PARENT_SCOPE) if (APPLE) set(IS_FRAMEWORK OFF) set(LIBS)

@@ -509,7 +510,15 @@ if(USE_PNG)

list(APPEND FEATURES PNG) include_directories(AFTER ${PNG_INCLUDE_DIRS}) list(APPEND DEPENDENCY_LIB ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libpng12-0") + if(PNG_VERSION_STRING) + string(REGEX MATCH "^[0-9]+\\.[0-9]+" PNG_VERSION_PARTIAL ${PNG_VERSION_STRING}) + if(${PNG_VERSION_PARTIAL} STREQUAL "1.6") + set(PNG_DEB_VERSION "16-16") + else() + set(PNG_DEB_VERSION "12-0") + endif() + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libpng${PNG_DEB_VERSION}") + endif() endif() if(WANT_SQLITE3 AND NOT USE_SQLITE3)