From 5b821725e7e4f603b5740b02424254df0cacee9e Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Mon, 14 Nov 2011 08:54:42 +0000 Subject: [PATCH] - cmake now compiles libpng statically if a static lib exists and static mode enabled --- source/glest_game/CMakeLists.txt | 4 ++++ source/shared_lib/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 6056db664..b66193df9 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -72,6 +72,10 @@ IF(BUILD_MEGAGLEST) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${JPEG_LIBRARY}) ENDIF() + OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) + IF(WANT_STATIC_LIBS) + SET(PNG_NAMES libpng.a ${PNG_NAMES}) + ENDIF() FIND_PACKAGE(PNG REQUIRED) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) IF(UNIX) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 0d2b4da23..c39117212 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -119,6 +119,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${JPEG_LIBRARY}) ENDIF() + OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) + IF(WANT_STATIC_LIBS) + SET(PNG_NAMES libpng.a ${PNG_NAMES}) + ENDIF() FIND_PACKAGE(PNG REQUIRED) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) IF(UNIX)