CMake: match defines & CMake variable names
Avoid mistakes with these variables getting mixed up
(see: bf03a2684b).
Ref !137183
This commit is contained in:
@@ -228,19 +228,19 @@ if(WITH_FREESTYLE)
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_CINEON)
|
||||
add_definitions(-DWITH_CINEON)
|
||||
add_definitions(-DWITH_IMAGE_CINEON)
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_OPENEXR)
|
||||
add_definitions(-DWITH_OPENEXR)
|
||||
add_definitions(-DWITH_IMAGE_OPENEXR)
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_OPENJPEG)
|
||||
add_definitions(-DWITH_OPENJPEG)
|
||||
add_definitions(-DWITH_IMAGE_OPENJPEG)
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_WEBP)
|
||||
add_definitions(-DWITH_WEBP)
|
||||
add_definitions(-DWITH_IMAGE_WEBP)
|
||||
endif()
|
||||
|
||||
if(WITH_INPUT_NDOF)
|
||||
|
||||
@@ -125,7 +125,7 @@ static PyObject *make_builtopts_info()
|
||||
SetObjIncref(Py_False);
|
||||
#endif
|
||||
|
||||
#ifdef WITH_CINEON
|
||||
#ifdef WITH_IMAGE_CINEON
|
||||
SetObjIncref(Py_True);
|
||||
#else
|
||||
SetObjIncref(Py_False);
|
||||
@@ -137,13 +137,13 @@ static PyObject *make_builtopts_info()
|
||||
/* HDR */
|
||||
SetObjIncref(Py_True);
|
||||
|
||||
#ifdef WITH_OPENEXR
|
||||
#ifdef WITH_IMAGE_OPENEXR
|
||||
SetObjIncref(Py_True);
|
||||
#else
|
||||
SetObjIncref(Py_False);
|
||||
#endif
|
||||
|
||||
#ifdef WITH_OPENJPEG
|
||||
#ifdef WITH_IMAGE_OPENJPEG
|
||||
SetObjIncref(Py_True);
|
||||
#else
|
||||
SetObjIncref(Py_False);
|
||||
@@ -152,7 +152,7 @@ static PyObject *make_builtopts_info()
|
||||
/* TIFF */
|
||||
SetObjIncref(Py_True);
|
||||
|
||||
#ifdef WITH_WEBP
|
||||
#ifdef WITH_IMAGE_WEBP
|
||||
SetObjIncref(Py_True);
|
||||
#else
|
||||
SetObjIncref(Py_False);
|
||||
|
||||
Reference in New Issue
Block a user