liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move and rename option accordingly to other already present

Browse Source
This commit is contained in:
Mattia Verga
2017-06-06 10:20:37 +02:00
parent a5e2107e40
commit 75812c900e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -113,6 +113,7 @@ option(WITH_MYFILE_MMAP "Build using memory mapped file" ON)
option(WITH_LTO "Build with link-time optimizations" OFF) option(WITH_LTO "Build with link-time optimizations" OFF)
option(WITH_SAN "Build with run-time sanitizer" OFF) option(WITH_SAN "Build with run-time sanitizer" OFF)
option(WITH_PROF "Build with profiling instrumentation" OFF) option(WITH_PROF "Build with profiling instrumentation" OFF)
option(WITH_SYSTEM_KLT "Build using system's KLT libraries." OFF)
option(OPTION_OMP "Build with OpenMP support" ON) option(OPTION_OMP "Build with OpenMP support" ON)
option(STRICT_MUTEX "True (recommended): MyMutex will behave like POSIX Mutex; False: MyMutex will behave like POSIX RecMutex; Note: forced to ON for Debug builds" ON) option(STRICT_MUTEX "True (recommended): MyMutex will behave like POSIX Mutex; False: MyMutex will behave like POSIX RecMutex; Note: forced to ON for Debug builds" ON)
option(TRACE_MYRWMUTEX "Trace custom R/W Mutex (Debug builds only); redirecting std::out to a file is strongly recommended!" OFF) option(TRACE_MYRWMUTEX "Trace custom R/W Mutex (Debug builds only); redirecting std::out to a file is strongly recommended!" OFF)
@@ -293,10 +294,9 @@ find_package(JPEG REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(TIFF REQUIRED) find_package(TIFF REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
option(USE_SYSTEM_KLT "Enable this option here or in cmake call if you want to use system's KLT libraries." OFF) if (WITH_SYSTEM_KLT)
if (USE_SYSTEM_KLT)
find_package (KLT REQUIRED) find_package (KLT REQUIRED)
endif(USE_SYSTEM_KLT) endif(WITH_SYSTEM_KLT)
# Link with bzip: # Link with bzip:
if(WITH_BZIP) if(WITH_BZIP)

2
rtengine/CMakeLists.txt
View File

@@ -111,7 +111,7 @@ set(RTENGINESOURCEFILES
utils.cc utils.cc
) )
if (NOT USE_SYSTEM_KLT) if (NOT WITH_SYSTEM_KLT)
set (RTENGINESOURCEFILES ${RTENGINESOURCEFILES} set (RTENGINESOURCEFILES ${RTENGINESOURCEFILES}
klt/convolve.cc klt/error.cc klt/klt.cc klt/klt_util.cc klt/pnmio.cc klt/pyramid.cc klt/selectGoodFeatures.cc klt/convolve.cc klt/error.cc klt/klt.cc klt/klt_util.cc klt/pnmio.cc klt/pyramid.cc klt/selectGoodFeatures.cc
klt/storeFeatures.cc klt/trackFeatures.cc klt/writeFeatures.cc klt/storeFeatures.cc klt/trackFeatures.cc klt/writeFeatures.cc