cmake updates

- Build only jpeg-static
- Add variables for libjpeg-turbo and gtest includes and libraries
- add dependencies on libjpeg-turbo and gtest to ensure they are
  built first before building the app, unit test and fuzzers

CMakeLists.txt

@@ -57,9 +57,16 @@ ExternalProject_Add(libjpeg-turbo
     PREFIX ${SRC_DIR}/third_party/build/libjpeg-turbo
     SOURCE_DIR ${SRC_DIR}/third_party/libjpeg-turbo
     TMP_DIR ${SRC_DIR}/third_party/build/libjpeg-turbo/tmp
+    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> --target jpeg-static
     INSTALL_COMMAND ""
 )
 
+set(JPEG_INCLUDE_DIR
+    ${SRC_DIR}/third_party/libjpeg-turbo/
+    ${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build)
+
+set(JPEG_LIBRARIES ${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build/libjpeg.a)
+
 ExternalProject_Add(googletest
     GIT_REPOSITORY https://android.googlesource.com/platform/external/googletest
     GIT_TAG main
@@ -69,6 +76,14 @@ ExternalProject_Add(googletest
     INSTALL_COMMAND ""
 )
 
+set(GTEST_INCLUDE_DIRS
+    ${SRC_DIR}/third_party/googletest/googletest/include
+    ${SRC_DIR}/third_party/googletest/googlemock/include)
+
+set(GTEST_LIBRARIES
+    ${SRC_DIR}/third_party/build/googletest/src/googletest-build/lib/libgtest.a
+    ${SRC_DIR}/third_party/build/googletest/src/googletest-build/lib/libgtest_main.a)
+
 add_library(ultrahdr STATIC
     "${SRC_DIR}/gainmapmath.cpp"
     "${SRC_DIR}/icc.cpp"
@@ -79,21 +94,18 @@ add_library(ultrahdr STATIC
     "${SRC_DIR}/multipictureformat.cpp"
 )
 
-set_target_properties(ultrahdr PROPERTIES COMPILE_FLAGS -std=c++17)
-
-# Set include directories for the target
 target_include_directories(ultrahdr PRIVATE
     "${SRC_DIR}/include"
-    "${SRC_DIR}/third_party/libjpeg-turbo/"
-    "${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build"
+    ${JPEG_INCLUDE_DIR}
     "${SRC_DIR}/third_party/image_io/includes/"
 )
 
 target_link_libraries(ultrahdr PRIVATE
-    ${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build/libjpeg.a
+    ${JPEG_LIBRARIES}
     image_io
     Threads::Threads
 )
+add_dependencies(ultrahdr libjpeg-turbo)
 
 libultrahdr_add_executable(ultrahdr_unit_test
     ultrahdr
@@ -106,44 +118,40 @@ libultrahdr_add_executable(ultrahdr_unit_test
         "${SRC_DIR}/tests/icchelper_test.cpp"
     INCLUDES
         "${SRC_DIR}/include"
-        "${SRC_DIR}/third_party/googletest/googletest/include"
-        "${SRC_DIR}/third_party/googletest/googlemock/include"
-        "${SRC_DIR}/third_party/libjpeg-turbo/"
-        "${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build"
+        ${GTEST_INCLUDE_DIRS}
+        ${JPEG_INCLUDE_DIR}
 )
+add_dependencies(ultrahdr_unit_test googletest libjpeg-turbo)
 
 libultrahdr_add_executable(ultrahdr_app
     ultrahdr
     SOURCES
         "${SRC_DIR}/tests/ultrahdr_app.cpp"
     INCLUDES
         "${SRC_DIR}/include"
-        "${SRC_DIR}/third_party/libjpeg-turbo/"
-        "${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build"
+        ${JPEG_INCLUDE_DIR}
 )
+add_dependencies(ultrahdr_app googletest libjpeg-turbo)
 
-target_link_libraries(ultrahdr_unit_test
-    ${SRC_DIR}/third_party/build/googletest/src/googletest-build/lib/libgmock.a
-    ${SRC_DIR}/third_party/build/googletest/src/googletest-build/lib/libgtest.a
-    ${SRC_DIR}/third_party/build/googletest/src/googletest-build/lib/libgtest_main.a
-)
+target_link_libraries(ultrahdr_unit_test ${GTEST_LIBRARIES})
 
 if (${ENABLE_FUZZERS})
 libultrahdr_add_fuzzer(ultrahdr_enc_fuzzer ultrahdr
     SOURCES
         ${SRC_DIR}/fuzzer/ultrahdr_enc_fuzzer.cpp
     INCLUDES
         ${SRC_DIR}/include
-        ${SRC_DIR}/third_party/libjpeg-turbo/
-        ${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build
+        ${JPEG_INCLUDE_DIR}
 )
+add_dependencies(ultrahdr_enc_fuzzer libjpeg-turbo)
+
 
 libultrahdr_add_fuzzer(ultrahdr_dec_fuzzer ultrahdr
     SOURCES
         ${SRC_DIR}/fuzzer/ultrahdr_dec_fuzzer.cpp
     INCLUDES
         ${SRC_DIR}/include
-        ${SRC_DIR}/third_party/libjpeg-turbo/
-        ${SRC_DIR}/third_party/build/libjpeg-turbo/src/libjpeg-turbo-build
+        ${JPEG_INCLUDE_DIR}
 )
+add_dependencies(ultrahdr_dec_fuzzer libjpeg-turbo)
 endif()