Fix typos in CMakeLists.txt files

- usdValidation was not being build as the PXR_BUILD_USD_VALIDATION config was not correctly set - Update PXR_PREFIX and PXR_PACKAGE for usdValidation and usdchecker - add module.cpp to pxr/usdValidation/usdValidation/CMakeLists.txt - Generate pch.h for windows builds. (Internal change: 2349786) (Internal change: 2349792)
PixarAnimationStudios · Dec 6, 2024 · 1f0b71a · 1f0b71a
1 parent 5810429
commit 1f0b71a
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 5 deletions.
diff --git a/pxr/CMakeLists.txt b/pxr/CMakeLists.txt
@@ -8,7 +8,7 @@ if (EXISTS "${PROJECT_SOURCE_DIR}/pxr/exec")
     add_subdirectory(exec)
 endif()
 
-if ($(PXR_BUILD_USD_VALIDATION))
+if (${PXR_BUILD_USD_VALIDATION})
     add_subdirectory(usdValidation)
 endif()
 

diff --git a/pxr/usdValidation/bin/usdchecker/CMakeLists.txt b/pxr/usdValidation/bin/usdchecker/CMakeLists.txt
@@ -14,8 +14,8 @@ if (NOT BUILD_SHARED_LIBS)
     return()
 endif()
 
-set(PXR_PREFIX pxr/usd)
-set(PXR_PACKAGE usd)
+set(PXR_PREFIX pxr/usdValidation)
+set(PXR_PACKAGE usdchecker)
 
 pxr_cpp_bin(usdchecker
     LIBRARIES

diff --git a/pxr/usdValidation/usdGeomValidators/pch.h b/pxr/usdValidation/usdGeomValidators/pch.h
@@ -0,0 +1,13 @@
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
+
+#include "pxr/pxr.h"
+#include <algorithm>
+#include <string>
+#include <vector>
diff --git a/pxr/usdValidation/usdShadeValidators/pch.h b/pxr/usdValidation/usdShadeValidators/pch.h
@@ -0,0 +1,13 @@
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
+
+#include "pxr/pxr.h"
+#include <algorithm>
+#include <unordered_map>
+#include <vector>
diff --git a/pxr/usdValidation/usdSkelValidators/pch.h b/pxr/usdValidation/usdSkelValidators/pch.h
@@ -0,0 +1,12 @@
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
+
+#include "pxr/pxr.h"
+#include <algorithm>
+#include <unordered_set>
diff --git a/pxr/usdValidation/usdUtilsValidators/pch.h b/pxr/usdValidation/usdUtilsValidators/pch.h
@@ -0,0 +1,11 @@
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
+
+#include "pxr/pxr.h"
+
diff --git a/pxr/usdValidation/usdUtilsValidators/validators.cpp b/pxr/usdValidation/usdUtilsValidators/validators.cpp
@@ -12,7 +12,7 @@
 #include "pxr/usdValidation/usdValidation/error.h"
 #include "pxr/usdValidation/usdValidation/registry.h"
 
-#include <pxr/usd/sdf/fileFormat.h>
+#include "pxr/usd/sdf/fileFormat.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 

diff --git a/pxr/usdValidation/usdValidation/CMakeLists.txt b/pxr/usdValidation/usdValidation/CMakeLists.txt
@@ -1,11 +1,12 @@
-set(PXR_PREFIX pxr/usd)
+set(PXR_PREFIX pxr/usdValidation)
 set(PXR_PACKAGE usdValidation)
 
 pxr_library(usdValidation
     LIBRARIES
         sdf
         plug
         tf
+        usd
         work
         ${TBB_tbb_LIBRARY}
 
@@ -29,6 +30,7 @@ pxr_library(usdValidation
         moduleDeps.cpp
 
     PYMODULE_CPPFILES
+        module.cpp
         wrapContext.cpp
         wrapError.cpp
         wrapRegistry.cpp

diff --git a/pxr/usdValidation/usdValidation/pch.h b/pxr/usdValidation/usdValidation/pch.h
@@ -0,0 +1,16 @@
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
+
+#include "pxr/pxr.h"
+#include <algorithm>
+#include <memory>
+#include <type_traits>
+#include <unordered_set>
+#include <utility>
+#include <vector>