Commit Graph

57 Commits

Author SHA1 Message Date
Takahito Tejima
5c54962d3b Improve OpenCL/DX interop configuration
build osd and examples with DX/CL interop only of cmake finds
cl_d3d11.h or cl_d3d11_ext.h.
2015-06-02 16:20:59 -07:00
David G. Yu
204425b20c Added TBB support for MSVC12 / Visual Studio 2013
Also fixed a couple of whitespace alignment discrepancies in the cmake script.
2015-05-19 23:52:51 -07:00
David G. Yu
b167096dd8 Fixed FindDXSDK to prefer more recent D3DCompile
The most up-to-date version of the HLSL compiler is now shipped as part
of the Windows SDK. Previously, the HLSL compiler was included with
the DirectX SDK.

There is more that we can do to improve this cmake module, but this
makes it more likely to find the correct tool.
2015-05-19 14:47:14 -07:00
Jeremy Cowles
ef97b4523d Fixing FindGLFW cmake module
Previously, FindGLFW would search for both GL/glfw.h and GLFW/glfw3.h, which
does not work when a system has both GLFW 2.0 and 3.0 installed.

The fix still probes for both files, but does so in two passes, preferring
glfw3.h.
2015-04-18 21:28:07 -07:00
jcowles
d758d572f7 Fix incorrect TBB path resolution order.
When two instances of TBB were present, the system installed version would take
precedence over an explicitly specified TBB_LOCATION path. This change puts
TBB_LOCATION into the HINTS section and leaves the system paths in the PATHS
section.
2015-03-31 15:09:14 -07:00
manuelk
fcf01afb19 Use CMake HINTS to override dependency locations
- fix cmake modules to search explicit locations ahead of default system paths

fixes #388
2015-02-10 13:13:39 -08:00
Christoph Kubisch
a4a5804c04 glfw3.1 prebuilt library directory added 2015-01-27 16:15:36 -08:00
stopiccot
28799f5135 Fixing iOS build 2014-12-08 12:12:19 +03:00
stopiccot
eeedcc155f Added search path for VS 2013 built-in DXSDK 2014-10-04 21:40:46 +03:00
manuelk
7ac73157f4 Bump gcc version requirement to 4.8 : upcoming changes run into compiler bugs with older gcc versions 2014-09-24 14:47:57 -07:00
manuelk
c399655dcc Landing 3.0.0.alpha
Sync'ing the 'dev' branch with the 'feature_3.0dev' branch at commit 68c6d11fc36761ae1a5e6cdc3457be16f2e9704a

The branch 'feature_3.0dev' is now locked and preserved for historical purposes.
2014-09-05 15:07:46 -07:00
manuelk
105919159d Fix glfw 3 Linux dependencies (add Xcursor and -lrt) 2014-08-07 10:20:03 -07:00
Sergey Sharybin
6ef232c95a Integrate CLEW into osd library and examples
If the system has CLEW installed (which is detected by recently
added FindCLEW routines) then OpenSubduv would be compiled against
this library.

It makes binaries and libraries more portable across the systems,
so it's possible to run the same binary on systems with and without
OpenCL SDK installed.

The most annoying part of the change is updating examples to load
OpenCL libraries, but ideally code around controllers and interface
creation is to be de-duplicated anyway.

Based on the pull request #303 from Martijn Berger
2014-05-22 09:10:59 +02:00
manuelk
a5e0309481 Adding a FindCLEW.cmake module in anticipation of using CLEW as a dependency 2014-05-20 10:28:27 -07:00
Nathan Litke
e91d931091 Changed FindGLFW.cmake so that setting the %GLFW_LOCATION% environment variable in Windows behaves like the CMake option, "-DGLFW_LOCATION=%GLFW_LOCATION%". 2014-04-17 19:11:19 -07:00
mkraemer
05a7db5e14 Make CMake path variables more robust
Add quotes around variables containing paths - this might require a second pass...

fixes #258
2014-04-09 16:43:38 -04:00
manuelk
6d367f7f13 Fix FindMaya.cmake
- switch PATHS to HINTS to make sure that we pick up the correct location for various files & libs
- fix the list append to dereference variables properly
- minor code style cleanup

fixes #266
2014-02-26 17:20:01 -08:00
manuelk
37f25250f1 Fix FindTBB.cmake
cmake find_path function searchs system directories first when PATHS is used.
using HINTS instead forces the search to start in the suggested locations, which
ensures that the correct headers are used.

fixes #265
2014-02-26 17:16:42 -08:00
manuelk
e072b19c2a Fix regex in FindMaya.cmake that breaks with recent versions of Maya 2013-11-26 15:53:14 -08:00
manuelk
3c4a06dba8 Fix FindGLFW.cmake for GLFW 3.03 on OSX
- add missing corevideo dependency

fixes #237
2013-11-13 13:08:29 -08:00
manuelk
3ae50d1c50 Amending Apache license language & file headers.
New text:

     Copyright 2013 Pixar

     Licensed under the Apache License, Version 2.0 (the "Apache License")
     with the following modification; you may not use this file except in
     compliance with the Apache License and the following modification to it:
     Section 6. Trademarks. is deleted and replaced with:

     6. Trademarks. This License does not grant permission to use the trade
        names, trademarks, service marks, or product names of the Licensor
        and its affiliates, except as required to comply with Section 4(c) of
        the License and to reproduce the content of the NOTICE file.

     You may obtain a copy of the Apache License at

         http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the Apache License with the above modification is
     distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied. See the Apache License for the specific
     language governing permissions and limitations under the Apache License.
2013-09-26 12:04:57 -07:00
manuelk
b6d2a85e2c Expand search paths for FindGLFW.cmake for Debian and other Linux architectures
PS: i have no access to a Debian release atm, so confirmation that this actually works
would be nice...
2013-09-17 10:26:25 -07:00
Hiroaki ENDOH
39de687c7a Corrected typo. 2013-09-17 10:02:01 +09:00
manuelk
d57df0eae0 Enable TBB for Linux builds
- Fix FindTBB.cmake
- Add TBB logic to various CMakeLists
- Update documentation
2013-08-15 16:11:33 -07:00
Manuel Kraemer
124c944f7a Merge pull request #203 from Nazg-Gul/dev
CLA signed - thank you for your contribution !
2013-08-02 08:41:54 -07:00
Sergey Sharybin
b96b3d9734 Make FindGLEW aware of multiarch on linux systems
Multiarch distros such as Debian are keeping libraries
in /usr/lib/<platform>/ instead of /usr/lib. Added an
additional hint for GLEW library location to deal with
this.
2013-08-02 00:03:48 -07:00
manuelk
03990c3101 fix GLFW Xrandr & xf86vmode dependency paths for X11 based systems
now uses the path returned by FindX11.cmake instead of just a -l<xxx>

fixes #199
2013-07-30 10:30:55 -07:00
takahito-tejima
dd91b2de8c Fix some portability issues on OSX. (GLEW will be used if exists) 2013-07-18 19:49:00 -07:00
Takahito Tejima
51a45b598d Updating EULA 2013-07-18 14:19:50 -07:00
manuelk
e3109ae507 Incremental commit for the new HTML documentation system:
- adding docutils cmake module
- adding rst2html conversion build step to our documentation folder
- adding tipue search system
- adding a python script to insert HTML navigation template and index HTML documentation contents
- adding RST documentation content, images and temporary CSS styling
2013-07-04 10:47:56 -07:00
manuelk
ca935d5a8d fix OSX build to search and use a dynamic Ptex lib instead of static. 2013-06-24 12:48:53 -07:00
manuelk
30ec963112 fix example code to work with GLFW 3.0
- fix FindGLFW.cmake to match the new locations

- fix all viewer & examples to build with 3.0, 3.0.1 and 3.0.2

Note : ptxViewer and paintTest do not work with 3.0.1 and 3.0.2 (yet)
2013-06-20 11:53:33 -07:00
Manuel Kraemer
9cceb15438 fix a comment : OPENCL_INCLUDE_DIRS (plural) 2013-03-16 18:38:17 -07:00
manuelk
50881546b4 add a cmake module to locate Intel's TBB 2013-03-14 19:35:15 -07:00
manuelk
afc7b9b9a8 - only add detected libs to the maya dependency list
- remove MAYA_tbb_LIBRARY from MayaViewer & MayaPtexViewer examples

fixes #130
2013-02-22 11:38:46 -08:00
Aras Pranckevicius
00728050de fix GLFW location finding on OSX when location is in environment variable 2013-02-03 09:43:12 +02:00
Aras Pranckevicius
84d91323ac fix linking with GLFW link on OSX 2013-02-02 22:11:34 +02:00
Manuel Kraemer
af81ecffba add glfw3 to windows section of glfw module
fixes #101
2013-01-31 16:26:39 -08:00
manuelk
7a39b0ad7c - add cmake logic to parse package versions and include the correct headers
- add #ifdefs to work around the different versions of glfw
- add cmake logic to parse other packages versions and set minimum requirements
- fix X11 dependencies for static builds of glfw

- general Find.cmake cleanup

fixes #101
2013-01-31 15:34:35 -08:00
Takahito Tejima
ab4f79c128 Remove deprecated GL calls, comply with 4.2/3.3 core profile. Use VAO, update glsl shaders, remove immediate draws, etc.
In example code, GLUT has been replaced with GLFW so that glViewer/ptexViewer can run on OSX (10.7 or later).

OSX note: still have some problem with clang, may need to explicitly specify gcc on cmake cmdline
 -DCMAKE_CXX_COMPILE=/usr/bin/g++

fixes #98
2013-01-29 15:54:18 -08:00
manuelk
468198e4a8 more cleanup :
- consolidate cmake compile flags
- turn on -Wall
- suppress hidden overloaded function warning when using Clang
  (part of it is bug, part of it will require code refactoring
  on our end)
- add support for Maya 2013.5 for windows in cmake module
- clean up some glew includes which break builds with MSVC Express
  & Windows SDK
- move the bitmap for font_image into a compiled object
- remove some unused variables and other minor warnings

Note : this is a checkpoint, there are still a few more warnings to clean up...

fixes #96
2013-01-24 13:40:43 -08:00
Manuel Kraemer
0bd9f0f916 fixes some OSX build issues :
- cmake should now be better at finding Maya installations on OSX automatically
- various dependency fixes for Maya plugins
- first pass at some code fixes to build Maya plugins on OSX

this not the final word on this : just like glutViewer, we will need a "_compat" version of these plugins

fixes #95
2013-01-18 14:25:02 -08:00
manuelk
6b4cb4e1bd changed permissions on FindDXSDK.cmake to match the rest of the directory 2013-01-10 11:22:34 -08:00
David G Yu
1547b59570 Updated to support GLES 2.0 on iOS and Android 2012-12-20 10:25:41 -08:00
manuelk
c9e020ade7 Reading the cmake generator string to find out if it's a 32 or 64 build
and force DX SDK linking to detect the correct location.
2012-12-11 19:57:11 -08:00
manuelk
754d7869b8 - adding Intel OpenCL kit in search paths
fixes #64
2012-12-11 12:14:30 -08:00
manuelk
10c687ecd5 Release Candidate 1.0 :
- [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf).

- New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code.

- DirectX 11 support

- and much more...
2012-12-10 17:15:13 -08:00
manuelk
a1552cfe82 Siggrpah 2012 - rolling over all of prepro work into beta 1.1 2012-08-03 19:51:27 -07:00
U-octave\dyu
2ebf29bbad Added minimal support for linking with freeglut instead of glut. 2012-06-26 02:12:30 -07:00
Manuel Kraemer
c465e3316f Adding support for OpenCL kernels (tested & working on F16 - still needs testing on Win / RH / Apple) 2012-06-16 16:03:52 -07:00