Sfoglia il codice sorgente

Dependency between igl::png and igl::opengl

Former-commit-id: ae65c94c52ee70c24e3487913c0b0e081777cebf
Jérémie Dumas 7 anni fa
parent
commit
66befa5b86
1 ha cambiato i file con 9 aggiunte e 5 eliminazioni
  1. 9 5
      shared/cmake/libigl.cmake

+ 9 - 5
shared/cmake/libigl.cmake

@@ -360,12 +360,16 @@ endif()
 ################################################################################
 ### Compile the png parts ###
 if(LIBIGL_WITH_PNG)
-  set(STB_IMAGE_DIR "${LIBIGL_EXTERNAL}/stb_image")
-  if(NOT TARGET stb_image)
-    add_subdirectory("${STB_IMAGE_DIR}" "stb_image")
+  if(TARGET igl_opengl)
+    set(STB_IMAGE_DIR "${LIBIGL_EXTERNAL}/stb_image")
+    if(NOT TARGET stb_image)
+      add_subdirectory("${STB_IMAGE_DIR}" "stb_image")
+    endif()
+    compile_igl_module("png" "")
+    target_link_libraries(igl_png ${IGL_SCOPE} igl_stb_image igl_opengl)
+  else()
+    set(LIBIGL_WITH_PNG OFF CACHE BOOL "" FORCE)
   endif()
-  compile_igl_module("png" "")
-  target_link_libraries(igl_png ${IGL_SCOPE} igl_stb_image)
 endif()
 
 ################################################################################