From 1b9b9705986c5b047dec5586e88b4889731cb9a5 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 5 Jun 2013 11:41:44 -0500 Subject: [PATCH] [libpng16] Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt --- ANNOUNCE | 1 + CHANGES | 1 + CMakeLists.txt | 23 +---------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index e199cbceb..151a63d53 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -80,6 +80,7 @@ Version 1.6.3beta06 [May 12, 2013] Version 1.6.3beta07 [June 5, 2013] Removed a redundant test in png_set_IHDR(). Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt) + Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 0ebd63a18..269834a02 100644 --- a/CHANGES +++ b/CHANGES @@ -4564,6 +4564,7 @@ Version 1.6.3beta06 [May 12, 2013] Version 1.6.3beta07 [June 5, 2013] Removed a redundant test in png_set_IHDR(). Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt) + Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index c4b945ed0..c9ce38738 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt -# Copyright (C) 2007-2011 Glenn Randers-Pehrson +# Copyright (C) 2007-2013 Glenn Randers-Pehrson # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -11,27 +11,6 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo") -if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE) - if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - # workaround CMake 2.4.x bug - set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING - "Choose the type of build, options are: - None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) - Debug - Release - RelWithDebInfo - MinSizeRel.") - else() - set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING - "Choose the type of build, options are: - None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) - Debug - Release - RelWithDebInfo - MinSizeRel.") - endif() -endif() - project(libpng C) enable_testing()