build: Fix libraw definitions (again)

Fixes 4586
Replaces 4587

Signed-off-by: Larry Gritz <[email protected]>

Author: lgritz

src/cmake/modules/FindLibRaw.cmake

@@ -96,7 +96,7 @@ if (LINKSTATIC)
         set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${LCMS2_LIBRARIES})
     endif()
     if (MSVC)
-        set (LibRaw_r_DEFINITIONS ${LibRaw_r_DEFINITIONS} LIBRAW_NODLL)
-        set (LibRaw_DEFINITIONS ${LibRaw_DEFINITIONS} LIBRAW_NODLL)
+        set (LibRaw_r_DEFINITIONS ${LibRaw_r_DEFINITIONS} -D LIBRAW_NODLL)
+        set (LibRaw_DEFINITIONS ${LibRaw_DEFINITIONS} -D LIBRAW_NODLL)
     endif()
 endif ()

src/raw.imageio/CMakeLists.txt

@@ -6,8 +6,7 @@ if (LIBRAW_FOUND)
     add_oiio_plugin (rawinput.cpp
                      INCLUDE_DIRS ${LibRaw_INCLUDE_DIR}
                      LINK_LIBRARIES ${LibRaw_r_LIBRARIES}
-                     COMPILE_OPTIONS ${LibRaw_r_DEFINITIONS}
-                     DEFINITIONS "USE_LIBRAW=1")
+                     DEFINITIONS "USE_LIBRAW=1" ${LibRaw_r_DEFINITIONS})
 else ()
     message (WARNING "Raw plugin will not be built")
 endif ()