diff --git a/CMakeLists.txt b/CMakeLists.txt
index d548d26a9..65e2d223f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,12 @@ endif( GME_FOUND AND NOT FORCE_INTERNAL_GME )
 
 set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
 
+if( NOT CMAKE_CROSSCOMPILING )
+	if( NOT CROSS_EXPORTS )
+		set( CROSS_EXPORTS "" )
+	endif( NOT CROSS_EXPORTS )
+endif( NOT CMAKE_CROSSCOMPILING )
+
 add_subdirectory( lzma )
 add_subdirectory( tools )
 add_subdirectory( dumb )
diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt
index 7f394e140..9ec7c2f61 100644
--- a/gdtoa/CMakeLists.txt
+++ b/gdtoa/CMakeLists.txt
@@ -34,7 +34,7 @@ if( NOT MSVC AND NOT APPLE )
 		DEPENDS qnan )
 		
 	set( GEN_FP_FILES arith.h gd_qnan.h )
-	set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENTY_BINARY_DIR}/gd_qnan.h )
+	set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h )
 endif( NOT MSVC AND NOT APPLE )
 
 add_library( gdtoa
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c53446c8..1564c9e60 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -595,12 +595,13 @@ else( WIN32 )
 	endif( APPLE )
 endif( WIN32 )
 
+if( NOT ASM_SOURCES )
+	set( ASM_SOURCES "" )
+endif( NOT ASM_SOURCES )
+
 if( NO_ASM )
 	add_definitions( -DNOASM )
 else( NO_ASM )
-	if( NOT ASM_SOURCES )
-		set( ASM_SOURCES "" )
-	endif( NOT ASM_SOURCES )
 	if( X64 )
 		ADD_ASM_FILE( asm_x86_64 tmap3 )
 	else( X64 )