diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfed311d1..bc014beb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,9 @@ cmake_policy( SET CMP0075 NEW )
 # Definitions that must happen before the project() command
 if( APPLE )
 
+   # Generate schema files
+   set( CMAKE_XCODE_GENERATE_SCHEME ON )
+
    # Define the OSX compatibility parameters
    set( CMAKE_OSX_ARCHITECTURES x86_64 CACHE INTERNAL "" )
    set( CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE INTERNAL "" )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 857c638d4..ce3950dee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1258,7 +1258,7 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
    set( WRAPPER_SOURCES "${WRAPPER_ROOT}/Wrapper.c" )
 
    add_executable( Wrapper "${WRAPPER_SOURCES}" )
-   add_dependencies( Wrapper "${TARGET}" )
+   add_dependencies( "${TARGET}" Wrapper )
 
    set_target_property_all( "Wrapper" RUNTIME_OUTPUT_DIRECTORY "${_EXEDIR}" )
    organize_source( "${WRAPPER_ROOT}" "mac" "${WRAPPER_SOURCES}" )