AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Put the bindings CMake stuff in a separate directory to keep things clean

Browse Source 
Fully remove the if(win32) stuff from the examples
This commit is contained in:
Matt Williams 2009-03-29 23:02:03 +00:00
parent ab331497d9
commit 1fb999966f
3 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
examples/OpenGL/CMakeLists.txt
View File

@ -40,29 +40,27 @@ SET(QT_USE_QTGUI 1)
SET(QT_USE_QTOPENGL 1) SET(QT_USE_QTOPENGL 1)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
#IF (WIN32) FIND_PACKAGE(OpenGL REQUIRED)
FIND_PACKAGE(OpenGL REQUIRED)
#NOTE: In Windows I haven't had much luck getting the FindGLUT script to work correctly. #NOTE: In Windows I haven't had much luck getting the FindGLUT script to work correctly.
#The easiest solution has been to install GLUT alongside OpenGL, which is already in the system path. #The easiest solution has been to install GLUT alongside OpenGL, which is already in the system path.
#This means glut.h and glut32.lib go in the 'include' and 'lib' folders within Microsoft Visual Studio 8\VC\PlatformSDK\ #This means glut.h and glut32.lib go in the 'include' and 'lib' folders within Microsoft Visual Studio 8\VC\PlatformSDK\
#Also, glut32.dll goes in C:\Windows\System. Using C:\Windows\System32 doesn't seem to work #Also, glut32.dll goes in C:\Windows\System. Using C:\Windows\System32 doesn't seem to work
#Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/include")
LINK_DIRECTORIES("../../library")
#Build #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
ADD_EXECUTABLE(OpenGLExample ${SRC_FILES}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/include")
TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d.lib optimized PolyVoxCore.lib) LINK_DIRECTORIES("../../library")
#Install #Build
INSTALL(TARGETS OpenGLExample ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
RUNTIME DESTINATION bin TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d.lib optimized PolyVoxCore.lib)
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib #Install
COMPONENT example INSTALL(TARGETS OpenGLExample
) RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore) #This shouldn't be needed ARCHIVE DESTINATION lib
#ENDIF (WIN32) COMPONENT example
)
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore) #This shouldn't be needed?

16
library/CMakeLists.txt
View File

@ -141,18 +141,4 @@ if(DOXYGEN_FOUND)
add_custom_target(doc COMMAND ${DOXYGEN_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building documentation" VERBATIM) add_custom_target(doc COMMAND ${DOXYGEN_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building documentation" VERBATIM)
endif() endif()
find_package(SWIG) add_subdirectory(bindings)
if(SWIG_FOUND)
include(${SWIG_USE_FILE})
find_package(PythonLibs)
include_directories(${PYTHON_INCLUDE_PATH})
set(CMAKE_SWIG_FLAGS "")
set_source_files_properties(bindings/PolyVoxCore.i PROPERTIES CPLUSPLUS ON)
swig_add_module(PolyVoxCore python bindings/PolyVoxCore.i)
swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore)
set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd")
endif()

14
library/bindings/CMakeLists.txt Normal file
View File

@ -0,0 +1,14 @@
find_package(SWIG)
if(SWIG_FOUND)
include(${SWIG_USE_FILE})
find_package(PythonLibs)
include_directories(${PYTHON_INCLUDE_PATH})
set(CMAKE_SWIG_FLAGS "")
set_source_files_properties(bindings/PolyVoxCore.i PROPERTIES CPLUSPLUS ON)
swig_add_module(PolyVoxCore python bindings/PolyVoxCore.i)
swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore)
set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd")
endif()