ujpeg vestigial if turbojpeg used (#952)

Author: neurolabusc

console/CMakeLists.txt

@@ -59,11 +59,11 @@ if(UNIX)
     if(ARM_CRC)
         # wrong answer for Apple Silicon: check_cxx_compiler_flag(-msse2 HAS_SSE2)
     else()
-	    check_cxx_compiler_flag(-msse2 HAS_SSE2)
-	    if(HAS_SSE2)
-	        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
-	    endif()
-	endif()
+      check_cxx_compiler_flag(-msse2 HAS_SSE2)
+      if(HAS_SSE2)
+          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
+      endif()
+  endif()
 endif()
 
 set(PROGRAMS dcm2niix)
@@ -86,12 +86,14 @@ set(DCM2NIIX_SRCS
     main_console.cpp
     nii_dicom.cpp
     jpg_0XC3.cpp
-    ujpeg.cpp
     nifti1_io_core.cpp
     nii_foreign.cpp
     nii_ortho.cpp
     nii_dicom_batch.cpp)
 
+if(NOT USE_TURBOJPEG)
+    set(DCM2NIIX_SRCS ${DCM2NIIX_SRCS} ujpeg.cpp)
+endif()
 
 option(USE_JNIFTI "Build with JNIfTI support" ON)
 if(USE_JNIFTI)
@@ -101,6 +103,8 @@ endif()
 
 if(BUILD_DCM2NIIXFSLIB)
     set(DCM2NIIXFSLIB dcm2niixfs)
+    # BUILD_DCM2NIIXFSLIB and USE_TURBOJPEG are not allowed to be enabled at
+    # the same time, so ujpeg.cpp is unconditionaly in this sources list:
     set(DCM2NIIXFSLIB_SRCS
         dcm2niix_fswrapper.cpp
         nii_dicom.cpp
@@ -195,12 +199,15 @@ if(BATCH_VERSION)
         main_console_batch.cpp
         nii_dicom.cpp
         jpg_0XC3.cpp
-        ujpeg.cpp
         nifti1_io_core.cpp
         nii_foreign.cpp
         nii_ortho.cpp
         nii_dicom_batch.cpp)
 
+    if(NOT USE_TURBOJPEG)
+        set(DCM2NIIBATCH_SRCS ${DCM2NIIBATCH_SRCS} ujpeg.cpp)
+    endif()
+
     if(USE_JNIFTI)
         set(DCM2NIIBATCH_SRCS ${DCM2NIIBATCH_SRCS} cJSON.cpp base64.cpp)
     endif()