Detect generateDS and recreate index.py/compound.py automatically

1 files changed, 6 insertions, 6 deletions

diff --git a/cmake/FindJavacc.cmake b/cmake/FindJavacc.cmake
index a134020..97a7827 100755
--- a/cmake/FindJavacc.cmake
+++ b/cmake/FindJavacc.cmake
@@ -1,25 +1,25 @@
 find_program(JAVACC_EXECUTABLE NAMES javacc javaCC Javacc JavaCC javacc.bat DOC "path to the javacc executable")
 mark_as_advanced(JAVACC_EXECUTABLE)
+set(JAVACC_FOUND 0)
 if(JAVACC_EXECUTABLE)
-  set(JAVACC_FOUND 1)
-  message(STATUS "The javacc executable: ${JAVACC_EXECUTABLE}")
   execute_process(
       COMMAND "${JAVACC_EXECUTABLE}" -version
       OUTPUT_VARIABLE JAVACC_TEMP_VERSION
   )
   string(REGEX MATCH ".* ([0-9]+(\\.[0-9]+)+) .*" JAVACC_TEMP_VERSION2_UNUSED "${JAVACC_TEMP_VERSION}")
   if(CMAKE_MATCH_1)
+    set(JAVACC_FOUND 1)
     set(JAVACC_VERSION ${CMAKE_MATCH_1})
   else()
     string(REGEX MATCH "([0-9]+(\\.[0-9]+)+)" JAVACC_TEMP_VERSION3_UNUSED "${JAVACC_TEMP_VERSION}")
     if(CMAKE_MATCH_1)
+      set(JAVACC_FOUND 1)
       set(JAVACC_VERSION ${CMAKE_MATCH_1})
-    else()
-      message(STATUS "Unable to determine JavaCC version, using existing files")
-      set(JAVACC_FOUND 0)
     endif()
   endif()
+endif()
+if(JAVACC_FOUND)
+  message(STATUS "The javacc executable: ${JAVACC_EXECUTABLE} (found version \"${JAVACC_VERSION}\")")
 else()
-  set(JAVACC_FOUND 0)
   message(STATUS "The javacc executable not found, using existing files")
 endif()