소스 검색

AntTweakBar module.

Former-commit-id: a117bedd0acd106fbb3bbfeb81b2db7d92dd073d
Jérémie Dumas 7 년 전
부모
커밋
157f71053a
1개의 변경된 파일12개의 추가작업 그리고 55개의 파일을 삭제
  1. 12 55
      shared/cmake/libigl.cmake

+ 12 - 55
shared/cmake/libigl.cmake

@@ -110,60 +110,15 @@ endif()
 compile_igl_module("core" "" ${SOURCES_IGL})
 compile_igl_module("core" "" ${SOURCES_IGL})
 
 
 ################################################################################
 ################################################################################
-### Compile the AntTweakBar part ###
-# if(LIBIGL_WITH_ANTTWEAKBAR)
-#   set(ANTTWEAKBAR_DIR "${LIBIGL_EXTERNAL}/AntTweakBar")
-#   set(ANTTWEAKBAR_INCLUDE_DIR "${ANTTWEAKBAR_DIR}/include")
-#   set(ANTTWEAKBAR_C_SRC_FILES
-#     "${ANTTWEAKBAR_DIR}/src/TwEventGLFW.c"
-#     "${ANTTWEAKBAR_DIR}/src/TwEventGLUT.c"
-#     "${ANTTWEAKBAR_DIR}/src/TwEventSDL.c"
-#     "${ANTTWEAKBAR_DIR}/src/TwEventSDL12.c"
-#     "${ANTTWEAKBAR_DIR}/src/TwEventSDL13.c"
-#     )
-#   set(ANTTWEAKBAR_CPP_SRC_FILES
-#     "${ANTTWEAKBAR_DIR}/src/LoadOGL.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/LoadOGLCore.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwBar.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwColors.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwEventSFML.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwFonts.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwMgr.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwOpenGL.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwOpenGLCore.cpp"
-#     "${ANTTWEAKBAR_DIR}/src/TwPrecomp.cpp"
-#     )
-#     # These are probably needed for windows/Linux, should append if
-#     # windows/Linux
-#     #"${ANTTWEAKBAR_DIR}/src/TwEventWin.c"
-#     #"${ANTTWEAKBAR_DIR}/src/TwEventX11.c"
-#     #"${ANTTWEAKBAR_DIR}/src/TwDirect3D10.cpp"
-#     #"${ANTTWEAKBAR_DIR}/src/TwDirect3D11.cpp"
-#     #"${ANTTWEAKBAR_DIR}/src/TwDirect3D9.cpp"
-#   list(
-#     APPEND
-#     ANTTWEAKBAR_SRC_FILES
-#     "${ANTTWEAKBAR_C_SRC_FILES}"
-#     "${ANTTWEAKBAR_CPP_SRC_FILES}")
-#   add_library(AntTweakBar STATIC "${ANTTWEAKBAR_SRC_FILES}")
-#   target_include_directories(AntTweakBar PUBLIC "${ANTTWEAKBAR_INCLUDE_DIR}")
-#   if(APPLE)
-#     set_target_properties(
-#       AntTweakBar
-#       PROPERTIES
-#       COMPILE_FLAGS
-#       "-fPIC -fno-strict-aliasing -x objective-c++")
-#     target_compile_definitions(
-#       AntTweakBar PUBLIC _MACOSX __PLACEMENT_NEW_INLINE)
-#   endif()
-#   list(APPEND LIBIGL_INCLUDE_DIRS "${ANTTWEAKBAR_INCLUDE_DIR}")
-#   set(LIBIGL_ANTTWEAKBAR_EXTRA_LIBRARIES "AntTweakBar")
-#   list(APPEND LIBIGL_EXTRA_LIBRARIES ${LIBIGL_ANTTWEAKBAR_EXTRA_LIBRARIES})
-#   if(LIBIGL_USE_STATIC_LIBRARY)
-#     compile_igl_module("anttweakbar" "")
-#     target_include_directories(igl_anttweakbar PRIVATE ${ANTTWEAKBAR_INCLUDE_DIR})
-#   endif()
-# endif()
+## Compile the AntTweakBar part ###
+if(LIBIGL_WITH_ANTTWEAKBAR)
+  set(ANTTWEAKBAR_DIR "${LIBIGL_EXTERNAL}/AntTweakBar")
+  if(NOT TARGET AntTweakBar)
+    add_subdirectory("${ANTTWEAKBAR_DIR}" AntTweakBar)
+  endif()
+  compile_igl_module("anttweakbar" "")
+  target_link_libraries(igl_anttweakbar ${IGL_SCOPE} AntTweakBar)
+endif()
 
 
 ################################################################################
 ################################################################################
 ### Compile the cgal parts ###
 ### Compile the cgal parts ###
@@ -186,7 +141,9 @@ endif()
 # comiso available here: https://github.com/libigl/CoMISo
 # comiso available here: https://github.com/libigl/CoMISo
 if(LIBIGL_WITH_COMISO)
 if(LIBIGL_WITH_COMISO)
   compile_igl_module("comiso" "copyleft/")
   compile_igl_module("comiso" "copyleft/")
-  add_subdirectory(${LIBIGL_EXTERNAL}/CoMISo CoMISo)
+  if(NOT TARGET CoMISo)
+    add_subdirectory("${LIBIGL_EXTERNAL}/CoMISo" CoMISo)
+  endif()
   target_link_libraries(igl_comiso ${IGL_SCOPE} CoMISo)
   target_link_libraries(igl_comiso ${IGL_SCOPE} CoMISo)
 endif()
 endif()