diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-01-16 16:28:42 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-01-16 16:28:42 +0100 |
| commit | f9b9e9d05800afd3867eb489bce8b040768bd0a9 (patch) | |
| tree | 48c91c0aca649a3925dae787d628afe5d22981ea /macosx | |
| parent | 96dacecd6e582cc006b90890cb936c188af719dc (diff) | |
| download | qtlocation-mapboxgl-f9b9e9d05800afd3867eb489bce8b040768bd0a9.tar.gz | |
makefile cleanup + icon
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/ATTRIBUTION | 1 | ||||
| -rw-r--r-- | macosx/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | macosx/Icon.icns | bin | 0 -> 359231 bytes |
3 files changed, 5 insertions, 4 deletions
diff --git a/macosx/ATTRIBUTION b/macosx/ATTRIBUTION new file mode 100644 index 0000000000..dff33b3b9a --- /dev/null +++ b/macosx/ATTRIBUTION @@ -0,0 +1 @@ +Icon from http://dryicons.com/icon/architecture-blueprint-icons-set/map/
\ No newline at end of file diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt index 0ac0d4e441..2e41a7a5a5 100644 --- a/macosx/CMakeLists.txt +++ b/macosx/CMakeLists.txt @@ -1,7 +1,7 @@ FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(OPENGL_LIBRARY OpenGL) FIND_LIBRARY(IOKIT_LIBRARY IOKit) -FIND_LIBRARY(COREVIDEO_LIBRARY CoreVidoe) +FIND_LIBRARY(COREVIDEO_LIBRARY CoreVideo) FIND_PACKAGE(PkgConfig REQUIRED) PKG_SEARCH_MODULE(GLFW REQUIRED glfw3) @@ -27,7 +27,7 @@ LINK_DIRECTORIES( # Define some settings for the Bundle set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.mapbox.llmr.native") -set(MACOSX_BUNDLE_ICON_FILE "macosx.icns") +set(MACOSX_BUNDLE_ICON_FILE "Icon.icns") set(MACOSX_BUNDLE_INFO_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") @@ -35,7 +35,7 @@ set(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PA set(MACOSX_BUNDLE_COPYRIGHT "(c) 2014 Mapbox") # Add Mac OS X specific icon -#list(APPEND macosx_RESOURCES ../resources/macosx.icns) +list(APPEND macosx_RESOURCES Icon.icns) # Ensures that resources end up in the Resources folder set_source_files_properties(${macosx_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) @@ -53,6 +53,6 @@ TARGET_LINK_LIBRARIES(macosx ${COCOA_LIBRARY} ${OPENGL_LIBRARY} ${IOKIT_LIBRARY} - ${COREVIDOE_LIBRARY} + ${COREVIDEO_LIBRARY} ${GLFW_LIBRARIES} ) diff --git a/macosx/Icon.icns b/macosx/Icon.icns Binary files differnew file mode 100644 index 0000000000..ab5ae136ff --- /dev/null +++ b/macosx/Icon.icns |