fix compilation on MacOSX

CMakeLists.txt

@@ -68,7 +68,7 @@ if (APPLE)
       # of MacOSX.
       # set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
 
-      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4)      #min version required
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)      #min version required
       set(HAS_AUDIOFILE TRUE)            # requires libsndfile
 
       find_library(AudioToolboxFW        NAMES AudioToolbox)
@@ -91,6 +91,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
       endif()
 endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
 
+if (APPLE)
+   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -stdlib=libc++ -g")
+   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -stdlib=libc++ -O2 -DNDEBUG")
+else (APPLE)
+   set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -g")
+   set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -O2 -DNDEBUG")
+endif(APPLE)
+
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
@@ -276,12 +284,19 @@ if (NOT MINGW AND NOT APPLE)
     install( FILES build/mscore.desktop DESTINATION share/applications)
 endif (NOT MINGW AND NOT APPLE)
 
-set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -g")
-set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -O2 -DNDEBUG")
-
 #
 #  create precompiled header file
 #
+
+# all.h is expected in PROJECT_BINARY_DIR by subdirs
+add_custom_command(
+    OUTPUT ${PROJECT_BINARY_DIR}/all.h
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+    DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+
 set (PCH ${PROJECT_BINARY_DIR}/all.h.gch)
 precompiled_header(QT_INCLUDES all)
 ADD_CUSTOM_TARGET(mops1 DEPENDS ${PROJECT_BINARY_DIR}/all.h)

aeolus/aeolus/aeolus.cpp

@@ -16,6 +16,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef Q_WS_MAC
+#include <locale.h>
+#endif
+
 #include "aeolus.h"
 #include "model.h"
 

build/CreatePrecompiledHeader.cmake

@@ -1,5 +1,6 @@
 macro( precompiled_header includes header_name )
-    if( ${CMAKE_COMPILER_IS_GNUCXX} AND NOT APPLE )
+    if( ${CMAKE_COMPILER_IS_GNUCXX})
+        message(STATUS "precompiled header generation")
         # Get the compiler flags for this build type
         string( TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" flags_for_build_name )
         set( compile_flags ${${flags_for_build_name}} )
@@ -28,14 +29,6 @@ macro( precompiled_header includes header_name )
         # Prepare the compile flags var for passing to GCC
         separate_arguments( compile_flags )
 
-        add_custom_command(
-            OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h
-            COMMAND ${CMAKE_COMMAND}
-            ARGS -E copy ${PROJECT_SOURCE_DIR}/${header_name}.h ${PROJECT_BINARY_DIR}/${header_name}.h
-            DEPENDS ${PROJECT_SOURCE_DIR}/${header_name}.h
-            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-            )
-
         add_custom_command(
          OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
          COMMAND ${CMAKE_CXX_COMPILER}

bww2mxml/CMakeLists.txt

@@ -35,7 +35,7 @@ add_library(bww STATIC
    writer.cpp
    )
 
-if (NOT MINGW)
+if (NOT MINGW AND NOT APPLE)
    add_executable(bww2mxml
       ${INCS}
       lexer.cpp
@@ -57,7 +57,7 @@ if (NOT MINGW)
       )
    ADD_DEPENDENCIES(bww2mxml mops1)
    ADD_DEPENDENCIES(bww2mxml mops2)
-endif (NOT MINGW)
+endif (NOT MINGW AND NOT APPLE)
 
 ADD_DEPENDENCIES(bww mops1)
 ADD_DEPENDENCIES(bww mops2)

mscore/CMakeLists.txt

@@ -378,14 +378,21 @@ else (MINGW)
    endif (APPLE)
 
    # gold does not use indirect shared libraries for symbol resolution, Linux only
-   if (NOT MINGW AND NOT APPLE)
+   if (NOT APPLE)
       if(USE_JACK)
          target_link_libraries(mscore dl)
       endif(USE_JACK)
       target_link_libraries(mscore rt)
-   endif (NOT MINGW AND NOT APPLE)
+   endif (NOT APPLE)
 
    if (APPLE)
+      set_target_properties(mscore
+        PROPERTIES
+           LINK_FLAGS "-stdlib=libc++"
+           #XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${PROJECT_BINARY_DIR}/all.h"
+           #XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES"
+        )
+
      install (TARGETS mscore BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX})
      install (FILES data/mscore.icns DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME})
      install (FILES data/musescoreDocument.icns DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME})

mscore/inspectorBase.h

@@ -49,7 +49,7 @@ class InspectorBase : public QWidget {
       void resetClicked(int);
 
    protected:
-      QVector<InspectorItem> iList;
+      std::vector<InspectorItem> iList;
       QVBoxLayout* _layout;
       Inspector* inspector;