[Piglit] [PATCH 0/4] CMake cleanups v2

Dylan Baker baker.dylan.c at gmail.com
Wed Jan 7 12:00:06 PST 2015


This series cleans up cmake and simplifies it, utting about 70 LOC and
using more standard CMake features.

Patch 1 is groundwork for the later patches

Patch 2-3 make finding python modules simpler

Patch 4 use a cmake module for waffle. This patch relies on a feature
that will be hitting all versions cmake (1.3, 1.4, 1.5) in the next
release. I would be fine with not merging this patch until new versions
of waffle hit distros.

Dylan Baker (4):
  cmake: use more standard cmake names
  cmake: use cmake builtin python module
  cmake: Simplify finding python modules
  cmake: Use waffle PackageConfig instead of pkg-find.

 CMakeLists.txt                      | 70 ++--------------------------
 cmake/Modules/FindPythonMako.cmake  | 23 +++++++++
 cmake/Modules/FindPythonNumpy.cmake | 23 +++++++++
 cmake/Modules/PiglitFindMako.cmake  | 93 -------------------------------------
 cmake/Modules/PythonModule.cmake    | 35 ++++++++++++++
 cmake/piglit_dispatch.cmake         |  2 +-
 generated_tests/CMakeLists.txt      |  2 +-
 tests/util/CMakeLists.txt           |  4 +-
 8 files changed, 90 insertions(+), 162 deletions(-)
 create mode 100644 cmake/Modules/FindPythonMako.cmake
 create mode 100644 cmake/Modules/FindPythonNumpy.cmake
 delete mode 100644 cmake/Modules/PiglitFindMako.cmake
 create mode 100644 cmake/Modules/PythonModule.cmake

-- 
2.2.1



More information about the Piglit mailing list