diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
index 4ad0be6de..91079d94c 100644
--- a/gdtoa/CMakeLists.txt
+++ b/gdtoa/CMakeLists.txt
@@ -17,13 +17,15 @@ add_definitions( -DINFNAN_CHECK -DMULTIPLE_THREADS )
 
 if( NOT MSVC )
 	add_executable( arithchk arithchk.c )
+	get_target_property( ARITHCHK_EXE arithchk LOCATION )
 	add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/arith.h 
-		COMMAND ${CMAKE_CURRENT_BINARY_DIR}/arithchk >${CMAKE_CURRENT_BINARY_DIR}/arith.h
+		COMMAND ${ARITHCHK_EXE} >${CMAKE_CURRENT_BINARY_DIR}/arith.h
 		DEPENDS arithchk )
 
 	add_executable( qnan qnan.c arith.h )
+	get_target_property( QNAN_EXE qnan LOCATION )
 	add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h
-		COMMAND ${CMAKE_CURRENT_BINARY_DIR}/qnan >${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h
+		COMMAND ${QNAN_EXE} >${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h
 		DEPENDS qnan )
 		
 	set( GEN_FP_FILES arith.h gd_qnan.h )
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
index 91b144575..f3b07a72f 100644
--- a/tools/lemon/CMakeLists.txt
+++ b/tools/lemon/CMakeLists.txt
@@ -5,13 +5,13 @@ set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )
 add_executable( lemon lemon.c )
 
 # Lemon wants lempar.c in its directory
-if( MSVC )
+if( NOT NO_GENERATOR_EXPRESSIONS )
 add_custom_command( TARGET lemon
 	POST_BUILD
 	COMMAND echo $<TARGET_FILE_DIR:lemon>
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lempar.c $<TARGET_FILE_DIR:lemon> )	
-else( MSVC )
+else( NOT NO_GENERATOR_EXPRESSIONS )
 add_custom_command( TARGET lemon
 	POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/lempar.c ${CMAKE_CURRENT_BINARY_DIR} )
-endif( MSVC )
\ No newline at end of file
+endif( NOT NO_GENERATOR_EXPRESSIONS )
\ No newline at end of file