Look for external programs early on and complain

CMakeLists.txt

@@ -136,12 +136,64 @@ endif(NOT LIB_INSTALL)
 
 mark_as_advanced(LIB_INSTALL)
 
-# we need perl for introspection -- find it
-find_program(perl_BIN "perl")
+
+# we need some external programs for building darktable
+message(STATUS "Looking for external programs")
+set(EXTERNAL_PROGRAMS_FOUND 1)
+
+# we need perl for introspection
+find_program(perl_BIN perl)
 if(${perl_BIN} STREQUAL "perl_BIN-NOTFOUND")
-  message(FATAL_ERROR "ERROR: perl not found, needed for iop introspection")
+  message(STATUS "Missing perl")
+  set(EXTERNAL_PROGRAMS_FOUND 0)
+else(${perl_BIN} STREQUAL "perl_BIN-NOTFOUND")
+  message(STATUS "Found perl")
 endif(${perl_BIN} STREQUAL "perl_BIN-NOTFOUND")
 
+# we need intltool-merge for darktable.desktop
+find_program(intltool_merge_BIN intltool-merge)
+if(${intltool_merge_BIN} STREQUAL "intltool_merge_BIN-NOTFOUND")
+  message(STATUS "Missing intltool-merge")
+  set(EXTERNAL_PROGRAMS_FOUND 0)
+else(${intltool_merge_BIN} STREQUAL "intltool_merge_BIN-NOTFOUND")
+  message(STATUS "Found intltool-merge")
+endif(${intltool_merge_BIN} STREQUAL "intltool_merge_BIN-NOTFOUND")
+
+# we need an xslt interpreter to generate preferences_gen.h and darktablerc
+find_program(Xsltproc_BIN xsltproc)
+if(${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+  message(STATUS "Missing xsltproc")
+  find_program(Saxon_BIN saxon-xslt)
+  if(${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
+    message(STATUS "Missing saxon-xslt")
+    message(STATUS "No xslt interpreter found")
+    set(EXTERNAL_PROGRAMS_FOUND 0)
+  else(${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
+    message(STATUS "Found saxon-xslt")
+  endif(${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
+else(${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+  message(STATUS "Found xsltproc")
+endif(${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
+
+# do we have xmllint?
+if(USE_XMLLINT)
+  find_program(Xmllint_BIN xmllint)
+  if(${Xmllint_BIN} STREQUAL "Xmllint_BIN-NOTFOUND")
+    message(STATUS "Missing xmllint")
+    set(USE_XMLLINT OFF)
+  else(${Xmllint_BIN} STREQUAL "Xmllint_BIN-NOTFOUND")
+    message(STATUS "Found xmllint")
+  endif(${Xmllint_BIN} STREQUAL "Xmllint_BIN-NOTFOUND")
+endif(USE_XMLLINT)
+
+# done with looking for programs
+if(NOT EXTERNAL_PROGRAMS_FOUND)
+  message(FATAL_ERROR "Some external programs couldn't be found")
+else(NOT EXTERNAL_PROGRAMS_FOUND)
+  message(STATUS "All external programs found")
+endif(NOT EXTERNAL_PROGRAMS_FOUND)
+
+
 #need to put here do setting LOCALE_DIR variable
 if(USE_NLS)
 find_package(Gettext)
@@ -231,30 +283,6 @@ if(NOT WIN32)
   endif(CMAKE_SYSTEM MATCHES "SunOS.*")
 endif(NOT WIN32)
 
-# we need an xslt interpreter to generate preferences_gen.h and darktablerc
-find_program(Xsltproc_BIN xsltproc)
-if(${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
-	message(STATUS "Missing xsltproc")
-	find_program(Saxon_BIN saxon-xslt)
-	if(${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
-		message(STATUS "Missing saxon-xslt")
-		message(FATAL_ERROR "No xslt interpreter found")
-	else(${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
-		message(STATUS "Found saxon-xslt")
-	endif(${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
-else(${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
-	message(STATUS "Found xsltproc")
-endif(${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
-
-# do we have xmllint?
-if(USE_XMLLINT)
-	find_program(Xmllint_BIN xmllint)
-	if(${Xmllint_BIN} STREQUAL "Xmllint_BIN-NOTFOUND")
-		message(STATUS "Could NOT find xmllint")
-		set(USE_XMLLINT OFF)
-	endif(${Xmllint_BIN} STREQUAL "Xmllint_BIN-NOTFOUND")
-endif(USE_XMLLINT)
-
 # lets continue into build directories
 add_subdirectory(src)
 add_subdirectory(data)

data/CMakeLists.txt

@@ -53,7 +53,7 @@ endif(USE_LUA)
 add_custom_command(
 		OUTPUT darktable.desktop
 		SOURCE darktable.desktop.in
-		COMMAND intltool-merge -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop
+		COMMAND ${intltool_merge_BIN} -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop
 		MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in
 		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../po/*.po
 )