[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkdcraw] /: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2012-10-24 13:52:50
Message-ID: 20121024135250.5F03BA6078 () git ! kde ! org
[Download RAW message or body]

Git commit 4b560983a057fb4125b46f74eff7a9fc8db99583 by Gilles Caulier.
Committed on 24/10/2012 at 15:52.
Pushed by cgilles into branch 'master'.

polish

M  +0    -12   CMakeLists.txt
M  +12   -0    libraw/CMakeLists.txt

http://commits.kde.org/libkdcraw/4b560983a057fb4125b46f74eff7a9fc8db99583

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9a68d4..7f96c3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,12 +191,6 @@ IF(NOT APPLE)
     ENDIF(OPENMP_FOUND)
 ENDIF(NOT APPLE)
 
-# Flag to debug LibRaw
-ADD_DEFINITIONS(-DDCRAW_VERBOSE)
-
-# Flag used by default into LibRaw to not use dedicated external thread
-ADD_DEFINITIONS(-DLIBRAW_NOTHREADS)
-
 # Flag to use libjpeg with LibRaw DNG lossy codec
 IF(JPEG_FOUND)
     ADD_DEFINITIONS(-DUSE_JPEG8)
@@ -211,12 +205,6 @@ IF(JASPER_FOUND)
     INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR})
 ENDIF()
 
-# Flag to include demosaic pack GPL2
-ADD_DEFINITIONS(-DLIBRAW_DEMOSAIC_PACK_GPL2)
-
-# Flag to include demosaic pack GPL3
-ADD_DEFINITIONS(-DLIBRAW_DEMOSAIC_PACK_GPL3)
-
 # LibRaw use C++ exception${CMAKE_THREAD_LIBS_INIT}
 ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
 
diff --git a/libraw/CMakeLists.txt b/libraw/CMakeLists.txt
index 785a358..a9c4de7 100644
--- a/libraw/CMakeLists.txt
+++ b/libraw/CMakeLists.txt
@@ -105,6 +105,18 @@ ENDIF()
 
 # ==================================================================================================
 
+# Flag to include demosaic pack GPL2
+ADD_DEFINITIONS(-DLIBRAW_DEMOSAIC_PACK_GPL2)
+
+# Flag to include demosaic pack GPL3
+ADD_DEFINITIONS(-DLIBRAW_DEMOSAIC_PACK_GPL3)
+
+# Flag to debug LibRaw
+ADD_DEFINITIONS(-DDCRAW_VERBOSE)
+
+# Flag used by default into LibRaw to not use dedicated external thread
+ADD_DEFINITIONS(-DLIBRAW_NOTHREADS)
+
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/
                     ${CMAKE_CURRENT_SOURCE_DIR}/demosaic-pack-GPL2
                     ${CMAKE_CURRENT_SOURCE_DIR}/demosaic-pack-GPL3
[prev in list] [next in list] [prev in thread] [next in thread]