Skip to content

Improve CMake configurations for various platform builds #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nyue wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve CMake configurations for various platform builds #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc0880d
Added FindPackage for Boost as not all systems have boost pre-installed
nyue Feb 3, 2014
7d649f1
Port to OS X
nyue Feb 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@

cmake_minimum_required( VERSION 2.6 )

find_package ( Boost )

include_directories ( ${Boost_INCLUDE_DIR} )

add_subdirectory( icons )
add_subdirectory( src )

34 changes: 26 additions & 8 deletions cmake/MayaConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,32 @@ IF( Maya_INCLUDE_DIR AND Maya_LIBRARIES )
SET( Maya_FIND_QUIETLY TRUE )
ENDIF( Maya_INCLUDE_DIR AND Maya_LIBRARIES )

FIND_PATH( Maya_INCLUDE_DIR maya/MFn.h ${MAYA_DIR}/include )

FIND_LIBRARY( Maya_LIB_Foundation NAMES Foundation PATHS ${MAYA_DIR}/lib )
FIND_LIBRARY( Maya_LIB_OpenMaya NAMES OpenMaya PATHS ${MAYA_DIR}/lib )
FIND_LIBRARY( Maya_LIB_OpenMayaAnim NAMES OpenMayaAnim PATHS ${MAYA_DIR}/lib )
FIND_LIBRARY( Maya_LIB_OpenMayaFX NAMES OpenMayaFX PATHS ${MAYA_DIR}/lib )
FIND_LIBRARY( Maya_LIB_OpenMayaRender NAMES OpenMayaRender PATHS ${MAYA_DIR}/lib )
FIND_LIBRARY( Maya_LIB_OpenMayaUI NAMES OpenMayaUI PATHS ${MAYA_DIR}/lib )
FIND_PATH( Maya_INCLUDE_DIR maya/MFn.h PATHS ${MAYA_DIR}/include ${MAYA_DIR}/devkit/include)

FIND_LIBRARY( Maya_LIB_Foundation NAMES Foundation
PATHS ${MAYA_DIR}/lib ${MAYA_DIR}/Maya.app/Contents/MacOS
NO_DEFAULT_PATH
)
FIND_LIBRARY( Maya_LIB_OpenMaya NAMES OpenMaya
PATHS ${MAYA_DIR}/lib ${MAYA_DIR}/Maya.app/Contents/MacOS
NO_DEFAULT_PATH
)
FIND_LIBRARY( Maya_LIB_OpenMayaAnim NAMES OpenMayaAnim
PATHS ${MAYA_DIR}/lib ${MAYA_DIR}/Maya.app/Contents/MacOS
NO_DEFAULT_PATH
)
FIND_LIBRARY( Maya_LIB_OpenMayaFX NAMES OpenMayaFX
PATHS ${MAYA_DIR}/lib ${MAYA_DIR}/Maya.app/Contents/MacOS
NO_DEFAULT_PATH
)
FIND_LIBRARY( Maya_LIB_OpenMayaRender NAMES OpenMayaRender
PATHS ${MAYA_DIR}/lib ${MAYA_DIR}/Maya.app/Contents/MacOS
NO_DEFAULT_PATH
)
FIND_LIBRARY( Maya_LIB_OpenMayaUI NAMES OpenMayaUI
PATHS ${MAYA_DIR}/lib ${MAYA_DIR}/Maya.app/Contents/MacOS
NO_DEFAULT_PATH
)

set( Maya_LIBRARIES ${Maya_LIB_Foundation} ${Maya_LIB_OpenMaya} ${Maya_LIB_OpenMayaAnim} ${Maya_LIB_OpenMayaFX} ${Maya_LIB_OpenMayaRender} ${Maya_LIB_OpenMayaUI} )

Expand Down
31 changes: 25 additions & 6 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ endif()

if( CMAKE_SYSTEM_NAME STREQUAL "Darwin" ) # MacOS

add_definitions( -Dfoo ) # TODO
add_definitions(
-DMAC_PLUGIN
-DREQUIRE_IOSTREAM
-DOSMac_
-DOSMac_MachO_
-D_BOOL
)

elseif( CMAKE_SYSTEM_NAME STREQUAL "Linux" ) # Linux

Expand All @@ -33,7 +39,7 @@ elseif( CMAKE_SYSTEM_NAME STREQUAL "Windows" ) # Windows
endif()


#find_package( OpenGL REQUIRED ) # seems to work w/o this
find_package( OpenGL REQUIRED ) # required on OS X
# libGLU is provided by Maya

set( Maya_DIR ../cmake )
Expand Down Expand Up @@ -62,6 +68,9 @@ include_directories(
${Maya_INCLUDE_DIR}
${RMAN_INCLUDE_DIR} )

# Maya module file creation #
file(WRITE ${CMAKE_BINARY_DIR}/dnPtcViewerNode.mod "+ dnPtcViewerNode any ${CMAKE_INSTALL_PREFIX}\n")

########### next target #################

set( dnPtcViewerNode_LIB_SRCS
Expand All @@ -71,14 +80,24 @@ set( dnPtcViewerNode_LIB_SRCS
add_library( dnPtcViewerNode MODULE ${dnPtcViewerNode_LIB_SRCS} )
# omit "lib" prefix from output
set_target_properties( dnPtcViewerNode PROPERTIES PREFIX "" )

target_link_libraries( dnPtcViewerNode ${Maya_LIBRARIES} ${RMAN_LIBRARY} )
if (APPLE)
set_target_properties( dnPtcViewerNode PROPERTIES SUFFIX ".bundle" )
elseif (WIN32)
set_target_properties( dnPtcViewerNode PROPERTIES SUFFIX ".mll" )
endif (APPLE)
target_link_libraries( dnPtcViewerNode ${Maya_LIBRARIES} ${RMAN_LIBRARY}
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
)

########### install files ###############

install( TARGETS dnPtcViewerNode
LIBRARY
DESTINATION bin/plug-ins )
DESTINATION plug-ins )

install( FILES AEdnPtcViewerNodeTemplate.mel
DESTINATION scripts/others )
DESTINATION scripts )

install ( FILES ${CMAKE_BINARY_DIR}/dnPtcViewerNode.mod
DESTINATION ${CMAKE_INSTALL_PREFIX})
4 changes: 4 additions & 0 deletions src/dnPtcViewerNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
#include <maya/MStringArray.h>
#include <maya/MTime.h>

#ifdef __APPLE__
#include <OpenGL/glu.h>
#else // __APPLE__
#include <GL/glu.h>
#endif // __APPLE__


#define USE_CALLBACKS 0
Expand Down