Upgrade template searching logic a bit, in light of new perplex build logic. In the 'standard' case, builds using perplex now stand a chance of 'just working' without requiring manual template specification.

starseeker · starseeker · commit 2ff824da692f · 2012-07-16T13:41:45.000Z
diff --git a/cmake/FindPERPLEX.cmake b/cmake/FindPERPLEX.cmake
@@ -51,13 +51,14 @@ if(PERPLEX_EXECUTABLE AND NOT PERPLEX_TEMPLATE)
   get_filename_component(perplex_path ${PERPLEX_EXECUTABLE} PATH)
   if(perplex_path)
     set(PERPLEX_TEMPLATE "")
-    if(EXISTS ${perplex_path}/perplex_template.c)
-      set(PERPLEX_TEMPLATE "${perplex_path}/perplex_template.c")
-    endif(EXISTS ${perplex_path}/perplex_template.c)
-    if(EXISTS /usr/share/perplex/perplex_template.c)
-      set(PERPLEX_TEMPLATE "/usr/share/perplex/perplex_template.c")
-    endif(EXISTS /usr/share/perplex/perplex_template.c)
+    if(EXISTS ${perplex_path}/../share/perplex/perplex_template.c)
+      get_filename_component(perplex_template_path "${perplex_path}/../share/perplex/perplex_template.c" ABSOLUTE)
+      set(PERPLEX_TEMPLATE "${perplex_template_path}")
+    endif(EXISTS ${perplex_path}/../share/perplex/perplex_template.c)
   endif(perplex_path)
+  if(EXISTS /usr/share/perplex/perplex_template.c)
+    set(PERPLEX_TEMPLATE "/usr/share/perplex/perplex_template.c")
+  endif(EXISTS /usr/share/perplex/perplex_template.c)
 endif(PERPLEX_EXECUTABLE AND NOT PERPLEX_TEMPLATE)
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PERPLEX DEFAULT_MSG PERPLEX_EXECUTABLE PERPLEX_TEMPLATE)
