Error if format_test can't be executed.

This ensures that on Travis, format_test will always be executed, or the
build fails.

1 files changed, 17 insertions, 2 deletions

diff --git a/cmake/ApiDsl.cmake b/cmake/ApiDsl.cmake
index 777714ab..759f7f05 100644
--- a/cmake/ApiDsl.cmake
+++ b/cmake/ApiDsl.cmake
@@ -10,14 +10,29 @@ find_program(APIDSL NAMES
   apidsl.byte
   ${CMAKE_SOURCE_DIR}/../apidsl/apigen.native)
 find_program(ASTYLE NAMES
-  astyle)
+  astyle
+  $ENV{ASTYLE})
 
 function(apidsl)
   if(APIDSL AND ASTYLE)
     foreach(in_file ${ARGN})
-      get_filename_component(dirname ${in_file} DIRECTORY)
+      # Get the directory component of the input file name.
+      if(CMAKE_VERSION VERSION_LESS 3.0)
+        execute_process(
+          COMMAND dirname ${in_file}
+          OUTPUT_VARIABLE dirname
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+      else()
+        get_filename_component(dirname ${in_file} DIRECTORY)
+      endif()
+
+      # Get the name without extension (i.e. without ".api.h").
       get_filename_component(filename ${in_file} NAME_WE)
+
+      # Put them together, with the new extension that is ".h".
       set(out_file ${CMAKE_SOURCE_DIR}/${dirname}/${filename}.h)
+
+      # Run apidsl.
       add_custom_command(
         OUTPUT ${out_file}
         COMMAND "${APIDSL}" "${CMAKE_SOURCE_DIR}/${in_file}"