Merge pull request #1 from ymesh/ymesh_dev

fix FindUSD.cmake for linux and macOS

Author: ababak

.gitignore

@@ -63,3 +63,12 @@ _deps
 
 # Out
 out
+
+# OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

cmake/FindUSD.cmake

@@ -33,60 +33,68 @@ if (NOT USD_FIND_COMPONENTS)
 endif ()
 
 if (EXISTS "$ENV{USD_INSTALL_ROOT}")
-    set(USD_INSTALL_ROOT $ENV{USD_INSTALL_ROOT})
+    set (USD_INSTALL_ROOT $ENV{USD_INSTALL_ROOT})
 endif ()
 
-find_path(USD_INCLUDE_DIR 
+find_path (USD_INCLUDE_DIR 
         pxr/pxr.h
         PATHS ${USD_INSTALL_ROOT}/include ${USD_INCLUDES_DIR}
         DOC "USD Include directory")
 
 if (LINUX)
-    set (libusd_name lib${USD_LIB_PREFIX}usd.so) 
+    set (libusd_name ${USD_LIB_PREFIX}usd.so) 
 elseif (WIN32)
     set (libusd_name ${USD_LIB_PREFIX}usd.lib)
 elseif (APPLE)
-    set (libusd_name ${USD_LIB_PREFIX}libusd.dylib)
+    set (libusd_name ${USD_LIB_PREFIX}usd.dylib)
 endif ()
 
-find_path(USD_LIBRARY_DIR 
+find_path (USD_LIBRARY_DIR 
         ${libusd_name}
         PATHS ${USD_INSTALL_ROOT}/lib ${USD_LIBRARIES_DIR}
         DOC "USD Libraries directory")
+
 if (USD_LIBRARY_DIR)
+    if (LINUX)
+        set (LIBRARY_SUFFIX ".so")
+    elseif (WIN32)
+        set (LIBRARY_SUFFIX ".lib")
+    elseif (APPLE)
+        set (LIBRARY_SUFFIX ".dylib")
+    endif ()
     message ("* USD_LIBRARY_DIR = ${USD_LIBRARY_DIR}")
-    # message (" * CMAKE_FIND_LIBRARY_PREFIXES = ${CMAKE_FIND_LIBRARY_PREFIXES}")
-    # message (" * CMAKE_FIND_LIBRARY_SUFFIXES = ${CMAKE_FIND_LIBRARY_SUFFIXES}")
     foreach (_lib ${USD_FIND_COMPONENTS})
-        if (EXISTS "${USD_LIBRARY_DIR}/${USD_LIB_PREFIX}${_lib}${CMAKE_FIND_LIBRARY_SUFFIXES}")
+        set (lib_name "${USD_LIBRARY_DIR}/${USD_LIB_PREFIX}${_lib}${LIBRARY_SUFFIX}")
+        # message (${lib_name})
+        if (EXISTS ${lib_name})
             message (STATUS "found ${_lib}")
-            list (APPEND USD_LIBRARIES ${USD_LIB_PREFIX}${_lib})
+            list (APPEND USD_LIBRARIES ${USD_LIB_PREFIX}${_lib}${LIBRARY_SUFFIX})
         else ()
-        message (SEND_ERROR "${_lib} not found")
+            message (SEND_ERROR "${_lib} not found")
         endif ()
-    endforeach()
+    endforeach ()
     message ("* USD_LIBRARIES = ${USD_LIBRARIES}")
 endif ()
 
-find_file(USD_GENSCHEMA
+find_file (USD_GENSCHEMA
         names usdGenSchema
         PATHS ${USD_INSTALL_ROOT}/bin ${USD_GENSCHEMA_DIR}
         DOC "USD Gen schema application")
 
-if(USD_INCLUDE_DIR AND EXISTS "${USD_INCLUDE_DIR}/pxr/pxr.h")
-    foreach(_usd_comp MAJOR MINOR PATCH)
-        file(STRINGS
+if (USD_INCLUDE_DIR AND EXISTS "${USD_INCLUDE_DIR}/pxr/pxr.h")
+    foreach (_usd_comp MAJOR MINOR PATCH)
+        file (STRINGS
              "${USD_INCLUDE_DIR}/pxr/pxr.h"
              _usd_tmp
              REGEX "#define PXR_${_usd_comp}_VERSION .*$")
-        string(REGEX MATCHALL "[0-9]+" USD_${_usd_comp}_VERSION ${_usd_tmp})
-    endforeach()
-    set(USD_VERSION ${USD_MAJOR_VERSION}.${USD_MINOR_VERSION}.${USD_PATCH_VERSION})
-endif()
+        string (REGEX MATCHALL "[0-9]+" USD_${_usd_comp}_VERSION ${_usd_tmp})
+    endforeach ()
+    set (USD_VERSION ${USD_MAJOR_VERSION}.${USD_MINOR_VERSION}.${USD_PATCH_VERSION})
+endif ()
 
-include(FindPackageHandleStandardArgs)
+include (FindPackageHandleStandardArgs)
 
-find_package_handle_standard_args(USD
+find_package_handle_standard_args (USD
     REQUIRED_VARS
         USD_INCLUDE_DIR
         USD_LIBRARY_DIR

source/cgcpp/_version.py

@@ -1 +1 @@
-__version__ = "1.4.0"
+__version__ = "1.5.0"