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.

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

Redpawfx #21

Open
wants to merge 470 commits into
base: master
from
Commits
Jump to file or symbol
Failed to load files and symbols.
+3,839 −1,707
Diff settings

Always

Just for now

Viewing a subset of changes. View all
View
@@ -1,6 +1,5 @@
/.sconsign.dblite
/kbuild.*
/src/doc/doc
/Linux-*
/Darwin-*
/build
@@ -9,6 +8,7 @@
/*.kdev*
*.cmake
*.txt
cmake_install.*
*.make
*.marks
*.includecache
@@ -40,4 +40,7 @@
CMakeScripts
CMakeFiles
partio.build
/src/doc/*
build-*
_hide
View
@@ -70,45 +70,49 @@ SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
## CHANGE THIS TO WHERE YOU PUT THE PARTIO MAIN DIRECTORY
SET( PARTIO_HOME ${CMAKE_SOURCE_DIR} )
# output executable and library path
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
SET(INCLUDE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/include)
## Setup platform specific helper defines build variants
IF(WIN32)
ADD_DEFINITIONS (-DPARTIO_WIN32)
# these are the defaults included with partio
SET( ZLIB_INCLUDE_DIR "${PARTIO_HOME}/winReqLibs/zlib-win_x64/include")
SET( ZLIB_LIBRARY_DIR "${PARTIO_HOME}/winReqLibs/zlib-win_x64/lib")
SET (ZLIB_LIBRARY "${ZLIB_LIBRARY_DIR}/zlib.lib")
SET( ZLIB_LIBRARY "${ZLIB_LIBRARY_DIR}/zlib.lib")
SET( GLUT_INCLUDE_DIR "${PARTIO_HOME}/winReqLibs/freeglut-2.8.0-1/include")
SET( GLUT_LIBRARY_DIR "${PARTIO_HOME}/winReqLibs/freeglut-2.8.0-1/lib/x64")
SET( SWIG_EXECUTABLE "${PARTIO_HOME}/winReqLibs/swigwin-2.0.4/swig.exe")
SET( PARTIO_BUILD_PLATFORM "windows_x86_64")
ELSE(WIN32)
ADD_DEFINITIONS (-Wextra -Wno-unused-parameter)
SET( CMAKE_CXX_FLAGS "-fPIC")
ENDIF(WIN32)
# we want to push the partio lib up to the main dir
SET( LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/lib")
## Set install location
IF (NOT DEFINED CMAKE_INSTALL_PREFIX)
EXECUTE_PROCESS(COMMAND sh -c "echo `uname`-`uname -r | cut -d'-' -f1`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/${VARIANT_DIRECTORY}")
ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
IF (UNIX)
#EXECUTE_PROCESS(COMMAND sh -c "echo `uname`-`uname -r | cut -d'-' -f1`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
EXECUTE_PROCESS(COMMAND sh -c "echo `uname`-`uname -m`" OUTPUT_VARIABLE VARIANT_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
SET(PARTIO_BUILD_PLATFORM "${VARIANT_DIRECTORY}")
MESSAGE(STATUS "Build Platform: ${PARTIO_BUILD_PLATFORM}")
ENDIF()
# output executable and library path
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build-${PARTIO_BUILD_PLATFORM}/bin/${PARTIO_BUILD_PLATFORM})
SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build-${PARTIO_BUILD_PLATFORM}/lib/${PARTIO_BUILD_PLATFORM})
SET(INCLUDE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build-${PARTIO_BUILD_PLATFORM}/include)
## Search for needed libraries
find_package(SWIG REQUIRED)
## Search for useful libraries
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
find_package(GLUT REQUIRED)
IF(GLUT_FOUND)
ELSE(GLUT_FOUND)
INCLUDE_DIRECTORIES ( ${GLUT_INCLUDE_DIR} )
LINK_DIRECTORIES ( ${GLUT_LIBRARY_DIR} )
LINK_DIRECTORIES ( ${GLUT_LIBRARY_DIR} )
ENDIF(GLUT_FOUND)
find_package(OpenGL REQUIRED)
@@ -130,29 +134,20 @@ ENDIF(ZLIB_FOUND)
IF (WIN32)
SET( PARTIO_LIBRARIES freeglut zlib partio )
ELSEIF(APPLE)
SET( PARTIO_LIBRARIES ${ZLIB_LIBRARY} partio )
SET( PARTIO_LIBRARIES ${ZLIB_LIBRARY} partio )
ELSEIF (UNIX)
SET( PARTIO_LIBRARIES glut z partio )
ENDIF()
# make it so partio can be found
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/lib )
# install partio headers for use by other programs
install(
FILES
${CMAKE_SOURCE_DIR}/src/lib/PartioAttribute.h
${CMAKE_SOURCE_DIR}/src/lib/Partio.h
${CMAKE_SOURCE_DIR}/src/lib/PartioIterator.h
DESTINATION ${INCLUDE_OUTPUT_PATH}
)
## Traverse subdirectories
ADD_SUBDIRECTORY (src/lib)
ADD_SUBDIRECTORY (src/tools)
ADD_SUBDIRECTORY (src/py)
ADD_SUBDIRECTORY (src/tests)
ADD_SUBDIRECTORY (src/doc)
ADD_SUBDIRECTORY (src/houdini)
#ADD_SUBDIRECTORY (src/doc)
ADD_SUBDIRECTORY (contrib)
View
@@ -1 +1,2 @@
add_subdirectory(partio4Maya)
add_subdirectory(partio4Maya)
add_subdirectory(partio4Arnold)
@@ -0,0 +1,26 @@
# - Arnold finder module
# This module searches for a valid Arnold instalation.
#
# Variables that will be defined:
# ARNOLD_FOUND Defined if a Arnold installation has been detected
# ARNOLD_LIBRARY Path to ai library
# ARNOLD_INCLUDE_DIR Path to the include directory
#
# Naming convention:
# Local variables of the form _arnold_foo
# Input variables from CMake of the form Arnold_FOO
# Output variables of the form ARNOLD_FOO
#
find_library(ARNOLD_LIBRARY
NAMES ai
PATHS $ENV{ARNOLD_HOME}/bin
DOC "Arnold library")
find_path(ARNOLD_INCLUDE_DIR ai.h
PATHS $ENV{ARNOLD_HOME}/include
DOC "Arnold include path")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Arnold DEFAULT_MSG
ARNOLD_LIBRARY ARNOLD_INCLUDE_DIR)
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.