Changeset View
Changeset View
Standalone View
Standalone View
graphics/darktable/files/patch-src_CMakeLists.txt
| --- src/CMakeLists.txt.orig 2016-12-31 12:42:13 UTC | --- src/CMakeLists.txt.orig 2017-01-27 11:03:43 UTC | ||||
| +++ src/CMakeLists.txt | +++ src/CMakeLists.txt | ||||
| @@ -254,7 +254,7 @@ if(USE_OPENJPEG) | @@ -257,7 +257,7 @@ if(USE_OPENJPEG) | ||||
| add_definitions("-DHAVE_OPENJPEG") | add_definitions("-DHAVE_OPENJPEG") | ||||
| list(APPEND SOURCES "common/imageio_j2k.c") | list(APPEND SOURCES "common/imageio_j2k.c") | ||||
| - include_directories(SYSTEM ${OpenJPEG_INCLUDE_DIRS}) | - include_directories(SYSTEM ${OpenJPEG_INCLUDE_DIRS}) | ||||
| + include_directories(BEFORE SYSTEM ${OpenJPEG_INCLUDE_DIRS}) | + include_directories(BEFORE SYSTEM ${OpenJPEG_INCLUDE_DIRS}) | ||||
| list(APPEND LIBS ${OpenJPEG_LIBRARIES}) | list(APPEND LIBS ${OpenJPEG_LIBRARIES}) | ||||
| endif(OpenJPEG_FOUND) | endif(OpenJPEG_FOUND) | ||||
| endif(USE_OPENJPEG) | endif(USE_OPENJPEG) | ||||
| @@ -415,8 +415,9 @@ if(NOT CUSTOM_CFLAGS) | @@ -418,8 +418,9 @@ if(NOT CUSTOM_CFLAGS) | ||||
| #-g MUST be set for ALL builds, or there will be no support for them when bugs happen | #-g MUST be set for ALL builds, or there will be no support for them when bugs happen | ||||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g") | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g") | ||||
| set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2") | set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2") | ||||
| - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only") | - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only") | ||||
| + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3") | + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3") | ||||
| if(CMAKE_COMPILER_IS_GNUCC) | if(CMAKE_COMPILER_IS_GNUCC) | ||||
| + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math -fno-finite-math-only") | + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math -fno-finite-math-only") | ||||
| if(BUILD_SSE2_CODEPATHS) | if(BUILD_SSE2_CODEPATHS) | ||||
| set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse") | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse") | ||||
| endif() | endif() | ||||
| @@ -429,8 +430,9 @@ if(NOT CUSTOM_CFLAGS) | @@ -432,8 +433,9 @@ if(NOT CUSTOM_CFLAGS) | ||||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g") | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g") | ||||
| set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2") | set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2") | ||||
| - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only") | - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only") | ||||
| + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") | + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") | ||||
| if(CMAKE_COMPILER_IS_GNUCXX) | if(CMAKE_COMPILER_IS_GNUCXX) | ||||
| + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math -fno-finite-math-only") | + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math -fno-finite-math-only") | ||||
| if(BUILD_SSE2_CODEPATHS) | if(BUILD_SSE2_CODEPATHS) | ||||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse") | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse") | ||||
| endif() | endif() | ||||