Merge remote-tracking branch 'origin'

This commit is contained in:
Philip Rosedale 2013-03-27 15:55:13 -07:00
commit c3bc43f48e

View file

@ -26,7 +26,7 @@ endif (WIN32)
configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h)
# grab the implementation and header files from src dir
file(GLOB INTERFACE_SRCS src/*.mm src/*.cpp src/*.h)
file(GLOB INTERFACE_SRCS src/*.cpp src/*.h)
if (APPLE)
# set how the icon shows up in the Info.plist file