diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index 3d833b424..b4ac321fb 100644
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -90,24 +90,24 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
   # linker such as GNU ld on Linux
 	set(comps 
 		ephemeris
-		bucket
 		environment
 		nasal
-		props
-		xml
-		debug 
     sky
 		material tgdb
     model    
     screen
+    bucket
     bvh
-		structure
 		util route
 		timing
 		threads
 		io
     serial
 		sound
+    structure
+    props
+    xml
+    debug 
 		misc
 		magvar
     math)
diff --git a/src/FDM/CMakeLists.txt b/src/FDM/CMakeLists.txt
index 3dd1225c9..72b685dc1 100644
--- a/src/FDM/CMakeLists.txt
+++ b/src/FDM/CMakeLists.txt
@@ -136,10 +136,6 @@ set(SOURCES
 	ExternalPipe/ExternalPipe.cxx
 	)
 
-if(ENABLE_YASIM)
-	add_subdirectory(YASim)
-endif()
-
 if(ENABLE_UIUC_MODEL)
 	foreach(component ${UIUC_SOURCES})
 		list(APPEND SOURCES "UIUCModel/${component}")
@@ -154,6 +150,11 @@ endif()
 
 flightgear_component(FDM "${SOURCES}")
 
+if(ENABLE_YASIM)
+	add_subdirectory(YASim)
+endif()
+
+
 if(ENABLE_JSBSIM)
     add_subdirectory(JSBSim)