--- a/data/cmake/FindFPC.cmake
+++ b/data/cmake/FindFPC.cmake
@@ -23,7 +23,12 @@
 mark_as_advanced(fpc_executable)
 
 if(fpc_executable)
-	 exec_program(${fpc_executable} ARGS "-h" OUTPUT_VARIABLE fpc_output)
+	 execute_process(
+	 COMMAND ${fpc_executable}
+	 ARGS -h
+	 OUTPUT_VARIABLE fpc_output
+	 RESULT_VARIABLE testnoexecstack
+	 )
 endif(fpc_executable)
 
 message(STATUS "Check for working Pascal compiler: ${fpc_executable}")
@@ -34,10 +39,11 @@
 
 file(WRITE ${checkdir}/checkstack.pas "begin end.")
 
-exec_program(${fpc_executable} ${checkdir}
+execute_process(
+	COMMAND ${fpc_executable} ${checkdir}
 	ARGS ${noexecstack_flags} checkstack.pas
 	OUTPUT_VARIABLE noout
-	RETURN_VALUE testnoexecstack
+	RESULT_VARIABLE testnoexecstack
 	)
 
 if(${testnoexecstack})
@@ -71,12 +77,14 @@
 	message(FATAL_ERROR "FPC compiler was not found!")
 endif()
 
-exec_program(${fpc_executable}
+execute_process(
+	COMMAND ${fpc_executable}
 	ARGS -iSP
 	OUTPUT_VARIABLE PASCAL_TARGET_ARCH
 )
 set(PASCAL_TARGET_ARCH ${PASCAL_TARGET_ARCH} CACHE INTERNAL "Target architecture")
-exec_program(${fpc_executable}
+execute_process(
+	COMMAND ${fpc_executable}
 	ARGS -iSO
 	OUTPUT_VARIABLE PASCAL_TARGET_OS
 )
--- a/data/cmake/FindLazbuild.cmake
+++ b/data/cmake/FindLazbuild.cmake
@@ -18,11 +18,16 @@
 
 message(STATUS "Check for Lazbuild: ${LAZBUILD_EXE}")
 
-exec_program(${LAZBUILD_EXE}
+execute_process(
+	COMMAND ${LAZBUILD_EXE}
 	ARGS --version
 	OUTPUT_VARIABLE lazbuild_out
 )
 
+if (lazbuild_out EQUAL 4.0)
+	set(lazbuild_out 4.0.0)
+endif()
+
 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" lcl_ver "${lazbuild_out}")
 
 if (lcl_ver)
