- adding new build flag options (NO_LIB, NO_CUDA...)

- move python build section into the python directory (cleaning up)

- fix some broken dependencies

- remove the public_headers targets if doxygen was not found

TODO :
- fix MSVC targets for public headers (wbn if MSVC didn't require the pro version
  in order to support solution folders)
- fix osd_regression to not build if -DNO_LIB is present (ie. fix the broken dependency)

CMakeLists.txt

@@ -250,7 +250,9 @@ endif()
 find_package(OpenGL)
 find_package(OpenGLES)
 find_package(OpenCL 1.1)
-find_package(CUDA 4.0)
+if(NOT NO_CUDA)
+    find_package(CUDA 4.0)
+endif()
 find_package(GLFW 2.7.0)
 find_package(PTex 2.0)
 find_package(PythonInterp 2.6)
@@ -383,57 +385,6 @@ else()
     )
 endif()
 
-if(PYTHONINTERP_FOUND AND SWIG_FOUND AND NOT NO_PYTHON)
-    message(STATUS "Python and SWIG found.  Looking for numpy...")
-    execute_process(
-        COMMAND
-        ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.get_include()"
-        OUTPUT_VARIABLE NUMPY_INCLUDE_PATH
-        RESULT_VARIABLE NUMPY_ERR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(NUMPY_ERR)
-        message(WARNING "Unable to import numpy.")
-    else()
-        message(STATUS "Numpy package has been located.")
-        set(PYCMD ${PYTHON_EXECUTABLE} setup.py build )
-        list(APPEND PYCMD --osddir=${LIBRARY_OUTPUT_PATH} )
-        list(APPEND PYCMD --build-platlib=${PROJECT_BINARY_DIR}/python )
-        list(APPEND PYCMD --build-temp=${PROJECT_BINARY_DIR}/temp )
-        
-        # grab all compiler definitions and add '-D'
-        get_directory_property( TMP DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
-        foreach(FLAG ${TMP})
-            list(APPEND SWIG_COMPILE_FLAGS "-D${FLAG}")
-        endforeach()
-        
-        # append platform specific compiler flags
-        list(APPEND SWIG_COMPILE_FLAGS ${OSD_COMPILER_FLAGS})
-        list(APPEND PYCMD --cxxflags="${SWIG_COMPILE_FLAGS}" )
-        
-        # add Swig -builtin optimization build flag 
-        if(SWIG_VERSION VERSION_GREATER 2.0.4)
-            list(APPEND SWIG_OPTS "-builtin")
-        endif()
-        list(APPEND PYCMD --swigopts="${SWIG_OPTS}" )
-        
-        add_custom_command(
-            OUTPUT ${PROJECT_BINARY_DIR}/python/osd
-            COMMAND ${PYCMD}
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python
-            DEPENDS osd_static_cpu osd_dynamic_cpu
-            COMMENT "Building Python bindings with distutils"
-        )
-        add_custom_target(python ALL
-            DEPENDS ${PROJECT_BINARY_DIR}/python/osd
-        )
-        install(CODE "execute_process(
-                      WORKING_DIRECTORY ../python 
-                      COMMAND ${PYCMD} install --user)"
-        )
-    endif()
-endif()
-
 # Link examples & regressions dynamically against Osd
 set( OSD_LINK_TARGET osd_dynamic_cpu osd_dynamic_gpu )
 
@@ -468,10 +419,12 @@ endif()
 
 # Macro for processing public headers into the build area for doxygen processing
 
+#set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 add_custom_target( public_headers )
 
 macro(_add_doxy_headers headers)
-    if (NOT NO_DOC)
+    if (NOT NO_DOC AND DOXYGEN_FOUND)
         file(RELATIVE_PATH path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
 
         string(REPLACE  "/" "_" targetpath ${path})
@@ -494,6 +447,8 @@ macro(_add_doxy_headers headers)
             )
 
             add_custom_target(${targetname} DEPENDS ${outfile})
+            
+            #set_target_properties(${targetname} PROPERTIES FOLDER "public_headers/")
 
             list(APPEND headerfiles ${targetname} )
         endforeach()
@@ -561,6 +516,10 @@ if (NOT NO_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
+if (NOT NO_PYTHON)
+    add_subdirectory(python)
+endif()
+
 if (NOT NO_DOC)
     add_subdirectory(documentation)
 endif()

documentation/cmake_build.rst

@@ -142,11 +142,13 @@ The following configuration arguments can be passed to the cmake command line.
    -DGLFW_LOCATION=[path to GLFW]
    -DMAYA_LOCATION=[path to Maya]
    
+   -DNO_LIB=1        // disable the opensubdiv libs build (caveat emptor)
    -DNO_EXAMPLES=1   // disable examples build
    -DNO_REGRESSION=1 // disable regression tests build
    -DNO_PYTHON=1     // disable Python SWIG build
    -DNO_DOC=1        // disable documentation build
    -DNO_OMP=1        // disable OpenMP
+   -DNO_CUDA=1       // disable CUDA
    -DNO_GCD=1        // disable GrandCentralDispatch on OSX
 
 Environment Variables

opensubdiv/osd/CMakeLists.txt

@@ -442,63 +442,66 @@ source_group("Kernels" FILES ${KERNEL_FILES})
 
 source_group("Inc" FILES ${INC_FILES})
 
-_add_possibly_cuda_library(osd_static_cpu STATIC
-    ${CPU_SOURCE_FILES}
-    ${PRIVATE_HEADER_FILES}
-    ${PUBLIC_HEADER_FILES}
-)
-set_target_properties(osd_static_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1)
+if (NOT NO_LIB)
 
-target_link_libraries(osd_static_cpu
-    ${PLATFORM_LIBRARIES}
-)
-
-_add_possibly_cuda_library(osd_static_gpu STATIC
-    ${GPU_SOURCE_FILES}
-    ${PRIVATE_HEADER_FILES}
-    ${PUBLIC_HEADER_FILES}
-    ${KERNEL_FILES}
-    ${INC_FILES}
-)
-set_target_properties(osd_static_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1)
-
-target_link_libraries(osd_static_gpu
-    ${PLATFORM_LIBRARIES}
-)
-
-install( TARGETS osd_static_cpu DESTINATION ${CMAKE_LIBDIR_BASE} )
-install( TARGETS osd_static_gpu DESTINATION ${CMAKE_LIBDIR_BASE} )
-
-if (NOT WIN32 AND NOT IOS)
-    _add_possibly_cuda_library(osd_dynamic_cpu SHARED
+    _add_possibly_cuda_library(osd_static_cpu STATIC
         ${CPU_SOURCE_FILES}
         ${PRIVATE_HEADER_FILES}
         ${PUBLIC_HEADER_FILES}
     )
+    set_target_properties(osd_static_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1)
 
-    set_target_properties(osd_dynamic_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1)
-
-    target_link_libraries(osd_dynamic_cpu
+    target_link_libraries(osd_static_cpu
         ${PLATFORM_LIBRARIES}
     )
 
-    _add_possibly_cuda_library(osd_dynamic_gpu SHARED
+    _add_possibly_cuda_library(osd_static_gpu STATIC
         ${GPU_SOURCE_FILES}
         ${PRIVATE_HEADER_FILES}
         ${PUBLIC_HEADER_FILES}
         ${KERNEL_FILES}
         ${INC_FILES}
     )
+    set_target_properties(osd_static_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1)
 
-    set_target_properties(osd_dynamic_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1)
-
-    target_link_libraries(osd_dynamic_gpu
-        osd_dynamic_cpu
+    target_link_libraries(osd_static_gpu
         ${PLATFORM_LIBRARIES}
     )
-    
-    install( TARGETS osd_dynamic_cpu DESTINATION ${CMAKE_LIBDIR_BASE} )
-    install( TARGETS osd_dynamic_gpu DESTINATION ${CMAKE_LIBDIR_BASE} )
+
+    install( TARGETS osd_static_cpu DESTINATION ${CMAKE_LIBDIR_BASE} )
+    install( TARGETS osd_static_gpu DESTINATION ${CMAKE_LIBDIR_BASE} )
+
+    if (NOT WIN32 AND NOT IOS)
+        _add_possibly_cuda_library(osd_dynamic_cpu SHARED
+            ${CPU_SOURCE_FILES}
+            ${PRIVATE_HEADER_FILES}
+            ${PUBLIC_HEADER_FILES}
+        )
+
+        set_target_properties(osd_dynamic_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1)
+
+        target_link_libraries(osd_dynamic_cpu
+            ${PLATFORM_LIBRARIES}
+        )
+
+        _add_possibly_cuda_library(osd_dynamic_gpu SHARED
+            ${GPU_SOURCE_FILES}
+            ${PRIVATE_HEADER_FILES}
+            ${PUBLIC_HEADER_FILES}
+            ${KERNEL_FILES}
+            ${INC_FILES}
+        )
+
+        set_target_properties(osd_dynamic_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1)
+
+        target_link_libraries(osd_dynamic_gpu
+            osd_dynamic_cpu
+            ${PLATFORM_LIBRARIES}
+        )
+
+        install( TARGETS osd_dynamic_cpu DESTINATION ${CMAKE_LIBDIR_BASE} )
+        install( TARGETS osd_dynamic_gpu DESTINATION ${CMAKE_LIBDIR_BASE} )
+    endif()
 endif()
 
 _add_doxy_headers( "${DOXY_HEADER_FILES}" )

python/CMakeLists.txt

@@ -0,0 +1,116 @@
+#
+#     Copyright (C) Pixar. All rights reserved.
+#
+#     This license governs use of the accompanying software. If you
+#     use the software, you accept this license. If you do not accept
+#     the license, do not use the software.
+#
+#     1. Definitions
+#     The terms "reproduce," "reproduction," "derivative works," and
+#     "distribution" have the same meaning here as under U.S.
+#     copyright law.  A "contribution" is the original software, or
+#     any additions or changes to the software.
+#     A "contributor" is any person or entity that distributes its
+#     contribution under this license.
+#     "Licensed patents" are a contributor's patent claims that read
+#     directly on its contribution.
+#
+#     2. Grant of Rights
+#     (A) Copyright Grant- Subject to the terms of this license,
+#     including the license conditions and limitations in section 3,
+#     each contributor grants you a non-exclusive, worldwide,
+#     royalty-free copyright license to reproduce its contribution,
+#     prepare derivative works of its contribution, and distribute
+#     its contribution or any derivative works that you create.
+#     (B) Patent Grant- Subject to the terms of this license,
+#     including the license conditions and limitations in section 3,
+#     each contributor grants you a non-exclusive, worldwide,
+#     royalty-free license under its licensed patents to make, have
+#     made, use, sell, offer for sale, import, and/or otherwise
+#     dispose of its contribution in the software or derivative works
+#     of the contribution in the software.
+#
+#     3. Conditions and Limitations
+#     (A) No Trademark License- This license does not grant you
+#     rights to use any contributor's name, logo, or trademarks.
+#     (B) If you bring a patent claim against any contributor over
+#     patents that you claim are infringed by the software, your
+#     patent license from such contributor to the software ends
+#     automatically.
+#     (C) If you distribute any portion of the software, you must
+#     retain all copyright, patent, trademark, and attribution
+#     notices that are present in the software.
+#     (D) If you distribute any portion of the software in source
+#     code form, you may do so only under this license by including a
+#     complete copy of this license with your distribution. If you
+#     distribute any portion of the software in compiled or object
+#     code form, you may only do so under a license that complies
+#     with this license.
+#     (E) The software is licensed "as-is." You bear the risk of
+#     using it. The contributors give no express warranties,
+#     guarantees or conditions. You may have additional consumer
+#     rights under your local laws which this license cannot change.
+#     To the extent permitted under your local laws, the contributors
+#     exclude the implied warranties of merchantability, fitness for
+#     a particular purpose and non-infringement.
+#
+
+if(PYTHONINTERP_FOUND AND SWIG_FOUND)
+    message(STATUS "Python and SWIG found.  Looking for numpy...")
+    execute_process(
+        COMMAND
+        ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.get_include()"
+        OUTPUT_VARIABLE NUMPY_INCLUDE_PATH
+        RESULT_VARIABLE NUMPY_ERR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(NUMPY_ERR)
+        message(WARNING "Unable to import numpy.")
+    else()
+        message(STATUS "Numpy package has been located.")
+        set(PYCMD ${PYTHON_EXECUTABLE} setup.py build )
+        list(APPEND PYCMD --osddir=${LIBRARY_OUTPUT_PATH} )
+        list(APPEND PYCMD --build-platlib=${PROJECT_BINARY_DIR}/python )
+        list(APPEND PYCMD --build-temp=${PROJECT_BINARY_DIR}/temp )
+        
+        # grab all compiler definitions and add '-D'
+        get_directory_property( TMP DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
+        foreach(FLAG ${TMP})
+            list(APPEND SWIG_COMPILE_FLAGS "-D${FLAG}")
+        endforeach()
+        
+        # append platform specific compiler flags
+        list(APPEND SWIG_COMPILE_FLAGS ${OSD_COMPILER_FLAGS})
+        list(APPEND PYCMD --cxxflags="${SWIG_COMPILE_FLAGS}" )
+        
+        # add Swig -builtin optimization build flag 
+        if(SWIG_VERSION VERSION_GREATER 2.0.4)
+            list(APPEND SWIG_OPTS "-builtin")
+        endif()
+        list(APPEND PYCMD --swigopts="${SWIG_OPTS}" )
+        
+        add_custom_command(
+            OUTPUT 
+                ${CURRENT_BINARY_DIR}/osd
+            COMMAND 
+                ${PYCMD}
+            WORKING_DIRECTORY 
+                ${CMAKE_SOURCE_DIR}/python
+            DEPENDS 
+                osd_static_cpu 
+                osd_dynamic_cpu
+            COMMENT 
+                "Building Python bindings with distutils"
+        )
+        add_custom_target(python ALL
+            DEPENDS 
+                ${CURRENT_BINARY_DIR}/osd
+        )
+        install(CODE "execute_process(
+                          WORKING_DIRECTORY 
+                              ../python 
+                          COMMAND 
+                              ${PYCMD} install --user)"
+        )
+    endif()
+endif()

regression/osd_regression/CMakeLists.txt

@@ -84,6 +84,8 @@ add_executable(osd_regression
     ${SOURCE_FILES}
 )
 
+add_dependencies(osd_regression blarg )
+
 target_link_libraries(osd_regression
     ${PLATFORM_LIBRARIES}
 )