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.
+10 −13
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Removing swig requirement and moving glut to building the library.

  • Loading branch information...
sirpalee committed Jun 21, 2017
commit 4c4a37c1af2a007fe2007a3caa1d45f326c369ae
View
@@ -91,19 +91,6 @@ ENDIF()
message(STATUS "CMAKE INSTALL PREFIX = ${CMAKE_INSTALL_PREFIX}")
## Search for needed libraries
find_package(SWIG REQUIRED)
## Search for useful libraries
find_package(GLUT REQUIRED)
IF(GLUT_FOUND)
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH} )
LINK_DIRECTORIES (${GLUT_ROOT_PATH}/lib/x64)
ELSE(GLUT_FOUND)
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH} )
LINK_DIRECTORIES ( ${GLUT_LIBRARY_PATH} )
ENDIF(GLUT_FOUND)
find_package(OpenGL REQUIRED)
find_package(ZLIB REQUIRED)
@@ -163,6 +150,16 @@ ELSE (LEGACY_BUILD_MODE)
# Temp removal of the python bindings, have to figure out how to change the swig files
#ADD_SUBDIRECTORY (src/py)
ADD_SUBDIRECTORY (src/tests)
## Search for useful libraries
find_package(GLUT REQUIRED)
IF(GLUT_FOUND)
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH} )
LINK_DIRECTORIES (${GLUT_ROOT_PATH}/lib/x64)
ELSE(GLUT_FOUND)
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH} )
LINK_DIRECTORIES ( ${GLUT_LIBRARY_PATH} )
ENDIF(GLUT_FOUND)
ENDIF (BUILD_PARTIO_LIBRARY)
#ADD_SUBDIRECTORY (src/houdini)
#ADD_DEFINITIONS_SUBDIRECTORY (src/doc)
ProTip! Use n and p to navigate between commits in a pull request.