diff --git a/openvdb_2_1_0_library/openvdb/CMakeLists.txt b/openvdb_2_1_0_library/openvdb/CMakeLists.txt index b7665a1..fc188b6 100755 --- a/openvdb_2_1_0_library/openvdb/CMakeLists.txt +++ b/openvdb_2_1_0_library/openvdb/CMakeLists.txt @@ -76,6 +76,8 @@ IF(DEFINED BUILD_UNITTEST AND BUILD_UNITTEST) ADD_SUBDIRECTORY(unittest) ENDIF() +ADD_SUBDIRECTORY(cmd) + INSTALL(TARGETS openvdb RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) INSTALL(FILES ${OPENVDB_HEADER_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/openvdb") diff --git a/openvdb_2_1_0_library/openvdb_maya/maya/CMakeLists.txt b/openvdb_2_1_0_library/openvdb_maya/maya/CMakeLists.txt index 6940695..c1be073 100755 --- a/openvdb_2_1_0_library/openvdb_maya/maya/CMakeLists.txt +++ b/openvdb_2_1_0_library/openvdb_maya/maya/CMakeLists.txt @@ -4,6 +4,8 @@ IF(MSVC) ADD_DEFINITIONS(-DNT_PLUGIN -DREQUIRE_IOSTREAM) ENDIF() +FIND_PACKAGE(OpenGL) + FIND_PATH(MAYA_DIR REQUIRED) SET(MAYA_INCLUDE_DIR "${MAYA_DIR}/include") SET(MAYA_LIBRARY_DIR "${MAYA_DIR}/lib") @@ -21,7 +23,7 @@ FILE(GLOB OPENVDBMAYA_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h) FILE(GLOB OPENVDBMAYA_SCRIPT_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.mel) ADD_LIBRARY(OpenVDBMaya SHARED ${OPENVDBMAYA_SOURCE_FILES} ${OPENVDBMAYA_HEADER_FILES} ${OPENVDBMAYA_SCRIPT_FILES}) -TARGET_LINK_LIBRARIES(OpenVDBMaya openvdb Half tbb ${ZLIB_LIBRARIES} OpenMayaUI Foundation OpenMaya OpenMayaFX OpenMayaRender glew32) +TARGET_LINK_LIBRARIES(OpenVDBMaya openvdb Half tbb ${ZLIB_LIBRARIES} OpenMayaUI Foundation OpenMaya OpenMayaFX OpenMayaRender glew32 ${OPENGL_LIBRARIES}) INSTALL(TARGETS OpenVDBMaya RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/maya/plugins") INSTALL(FILES ${OPENVDBMAYA_SCRIPT_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/maya/scripts")