Merge pull request #137 from marsupial/cmake

Note this merge only pulls in commits 863c418 and 566447a; commit 234cbf9 should not be needed as issue #117 was fixed by commit 3018943.
PixarAnimationStudios · Apr 14, 2017 · e3eb1f7 · e3eb1f7
2 parents 3e819e7 + ec04a46
commit e3eb1f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(PXR_PYTHON_SHEBANG "${PYTHON_EXECUTABLE}"
 # build files readable.
 include(CXXDefaults)
 add_definitions(${_PXR_CXX_DEFINITIONS})
-set(CMAKE_CXX_FLAGS ${_PXR_CXX_FLAGS})
+set(CMAKE_CXX_FLAGS "${_PXR_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 
 include(Public)
 

diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
@@ -24,8 +24,8 @@
 # Core USD Package Requirements 
 # ----------------------------------------------
 # --Python.  We are generally but not completely 2.6 compliant.
-find_package(PythonLibs 2.7 REQUIRED)
 find_package(PythonInterp 2.7 REQUIRED)
+find_package(PythonLibs 2.7 REQUIRED)
 
 # --Boost
 find_package(Boost