Permalink
Browse files

working on windows build

  • Loading branch information...
1 parent 05cffbb commit df40c602692759b964df0a069f0dc89e0df43539 @enjalot committed Apr 12, 2011
Showing with 1,625 additions and 1,528 deletions.
  1. +0 −1 CMakeLists.txt
  2. +9 −7 cmake/FindGLEW.cmake
  3. +96 −0 cmake/FindGLUT.cmake
  4. +7 −7 cmake/FindOPENCL.cmake
  5. +1,513 −1,513 rtpslib/doc/doxyfile
View
@@ -5,7 +5,6 @@ ENDIF (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
project(rtpsuite)
-
#need to include FindOPENCL.cmake to
SET( RTPS_CMAKE_MODULE_PATH
${rtpsuite_SOURCE_DIR}/cmake
View
@@ -12,21 +12,23 @@ message(GLEW path "$ENV{GLEW_PATH}")
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
$ENV{PROGRAMFILES}/GLEW/include
${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
- ~/glew-1.5.8/include
- #$ENV{GLEW_PATH}/include
- $ENV{NVSDKCOMPUTE_ROOT}/shared/inc
+ ~/glew-1.5.8/include
+ #$ENV{GLEW_PATH}/include
+ $ENV{NVSDKCOMPUTE_ROOT}/shared/inc
DOC "The directory where GL/glew.h resides")
+
FIND_LIBRARY( GLEW_LIBRARY
NAMES glew GLEW glew32 glew32s
PATHS
- ~/glew-1.5.8/bin
- ~/glew-1.5.8/lib
+ ~/glew-1.5.8/bin
+ ~/glew-1.5.8/lib
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
- #$ENV{GLEW_PATH}/lib
- $ENV{NVSDKCOMPUTE_ROOT}/shared/lib
+ #$ENV{GLEW_PATH}/lib
+ $ENV{NVSDKCOMPUTE_ROOT}/shared/lib
DOC "The GLEW library")
+
ELSE (WIN32)
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
/usr/include
View
@@ -0,0 +1,96 @@
+# - try to find glut library and include files
+# GLUT_INCLUDE_DIR, where to find GL/glut.h, etc.
+# GLUT_LIBRARIES, the libraries to link against
+# GLUT_FOUND, If false, do not try to use GLUT.
+# Also defined, but not for general use are:
+# GLUT_glut_LIBRARY = the full path to the glut library.
+# GLUT_Xmu_LIBRARY = the full path to the Xmu library.
+# GLUT_Xi_LIBRARY = the full path to the Xi Library.
+
+#=============================================================================
+# Copyright 2001-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+IF (WIN32)
+ FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h
+ PATHS
+ ${GLUT_ROOT_PATH}/include
+ $ENV{NVSDKCOMPUTE_ROOT}/shared/inc
+ )
+ FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32
+ PATHS
+ ${OPENGL_LIBRARY_DIR}
+ ${GLUT_ROOT_PATH}/Release
+ $ENV{NVSDKCOMPUTE_ROOT}/shared/lib
+ )
+ELSE (WIN32)
+
+ IF (APPLE)
+ # These values for Apple could probably do with improvement.
+ FIND_PATH( GLUT_INCLUDE_DIR glut.h
+ /System/Library/Frameworks/GLUT.framework/Versions/A/Headers
+ ${OPENGL_LIBRARY_DIR}
+ )
+ SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX")
+ SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
+ ELSE (APPLE)
+
+ FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
+ /usr/include/GL
+ /usr/openwin/share/include
+ /usr/openwin/include
+ /opt/graphics/OpenGL/include
+ /opt/graphics/OpenGL/contrib/libglut
+ )
+
+ FIND_LIBRARY( GLUT_glut_LIBRARY glut
+ /usr/openwin/lib
+ )
+
+ FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
+ /usr/openwin/lib
+ )
+
+ FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
+ /usr/openwin/lib
+ )
+
+ ENDIF (APPLE)
+
+ENDIF (WIN32)
+
+SET( GLUT_FOUND "NO" )
+IF(GLUT_INCLUDE_DIR)
+ IF(GLUT_glut_LIBRARY)
+ # Is -lXi and -lXmu required on all platforms that have it?
+ # If not, we need some way to figure out what platform we are on.
+ SET( GLUT_LIBRARIES
+ ${GLUT_glut_LIBRARY}
+ ${GLUT_Xmu_LIBRARY}
+ ${GLUT_Xi_LIBRARY}
+ ${GLUT_cocoa_LIBRARY}
+ )
+ SET( GLUT_FOUND "YES" )
+
+ #The following deprecated settings are for backwards compatibility with CMake1.4
+ SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
+ SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
+
+ ENDIF(GLUT_glut_LIBRARY)
+ENDIF(GLUT_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(
+ GLUT_INCLUDE_DIR
+ GLUT_glut_LIBRARY
+ GLUT_Xmu_LIBRARY
+ GLUT_Xi_LIBRARY
+ )
View
@@ -8,14 +8,14 @@
# WIN32 should work, but is untested
IF (WIN32)
-message(*****Opencl for windows: "$ENV{GPU_COMPUTING_TOOLKIT}" ******)
- IF(NOT ${GPU_COMPUTING_TOOLKIT})
+message(*****Opencl for windows: "$ENV{CUDA_PATH}" ******)
+ IF(NOT ${CUDA_PATH})
# CYGWIN:
- SET (GPU_COMPUTING_TOOLKIT "/cygdrive/c/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v3.2/")
- ENDIF (NOT ${GPU_COMPUTING_TOOLKIT})
+ SET (CUDA_PATH "/cygdrive/c/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v3.2/")
+ ENDIF (NOT ${CUDA_PATH})
FIND_PATH(OPENCL_INCLUDE_DIR CL/cl.h
- $ENV{GPU_COMPUTING_TOOLKIT}/include
+ $ENV{CUDA_PATH}/include
)
# TODO this is only a hack assuming the 64 bit library will
@@ -25,8 +25,8 @@ message(*****Opencl for windows: "$ENV{GPU_COMPUTING_TOOLKIT}" ******)
FIND_LIBRARY(OPENCL_LIBRARIES
NAMES OpenCL opencl opencl32 opencl64 OpenCL.dll
PATHS
- $ENV{GPU_COMPUTING_TOOLKIT}/lib/Win32
- $ENV{GPU_COMPUTING_TOOLKIT}/lib/x64
+ $ENV{CUDA_PATH}/lib/Win32
+ $ENV{CUDA_PATH}/lib/x64
/cygdrive/c/Windows/System32
/cygdrive/c/Windows/SysWOW64
)
Oops, something went wrong.

0 comments on commit df40c60

Please sign in to comment.