walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

renamed USE_THREAD to OPJ_USE_THREAD 

renaming to be consistent with previous OPJ CMake options
This commit is contained in:
Antonin Descampe 2016-09-16 17:54:12 +02:00
parent 6e7616c83c
commit 3aaeea7ce8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/openjp2/CMakeLists.txt
View File

@ -127,7 +127,7 @@ endif()
# Experimental option; let's how cppcheck performs # Experimental option; let's how cppcheck performs
# Implementation details: # Implementation details:
# I could not figure out how to easily upload a file to CDash. Instead simply # I could not figure out how to easily upload a file to CDash. Instead simply
# pretend cppcheck is part of the Build step. Technically cppcheck can even # pretend cppcheck is part of the Build step. Technically cppcheck can even
# output gcc formatted error/warning report # output gcc formatted error/warning report
# Another implementation detail: I could not redirect error to the error # Another implementation detail: I could not redirect error to the error
@ -156,30 +156,30 @@ endif()
################################################################################# #################################################################################
set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
option(USE_THREAD "Build with thread/mutex support " ON) option(OPJ_USE_THREAD "Build with thread/mutex support " ON)
if(NOT USE_THREAD) if(NOT OPJ_USE_THREAD)
add_definitions( -DMUTEX_stub) add_definitions( -DMUTEX_stub)
endif(NOT USE_THREAD) endif(NOT OPJ_USE_THREAD)
find_package(Threads QUIET) find_package(Threads QUIET)
if(USE_THREAD AND WIN32 AND NOT Threads_FOUND ) if(OPJ_USE_THREAD AND WIN32 AND NOT Threads_FOUND )
add_definitions( -DMUTEX_win32) add_definitions( -DMUTEX_win32)
set(Threads_FOUND YES) set(Threads_FOUND YES)
endif() endif()
if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) if(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT )
add_definitions( -DMUTEX_win32) add_definitions( -DMUTEX_win32)
endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT )
if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) if(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT )
add_definitions( -DMUTEX_pthread) add_definitions( -DMUTEX_pthread)
endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT )
if(USE_THREAD AND NOT Threads_FOUND) if(OPJ_USE_THREAD AND NOT Threads_FOUND)
message(FATAL_ERROR "No thread library found and thread/mutex support is required by USE_THREAD option") message(FATAL_ERROR "No thread library found and thread/mutex support is required by OPJ_USE_THREAD option")
endif(USE_THREAD AND NOT Threads_FOUND) endif(OPJ_USE_THREAD AND NOT Threads_FOUND)
if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) if(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT}) TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} ${CMAKE_THREAD_LIBS_INIT})
endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT) endif(OPJ_USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)