diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-28 12:32:21 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-28 12:32:21 -0400 |
| commit | 3fca4b0d61ad4534f26a8963ed6381a76e4f7c19 (patch) | |
| tree | bd563f39e6bbd5984c4c529bf0252de9b94f2ea5 /indra/llplugin/slplugin/CMakeLists.txt | |
| parent | 3ce3df564351ad7b6fb0acd4e0252b5f89f2a47e (diff) | |
| parent | 8d18056e8296472d58a820fd77a6a66100e70661 (diff) | |
automated merge
Diffstat (limited to 'indra/llplugin/slplugin/CMakeLists.txt')
| -rw-r--r-- | indra/llplugin/slplugin/CMakeLists.txt | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index c1536e85de..08d35f9ae7 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -16,6 +16,7 @@ include_directories( if (DARWIN) include(CMakeFindFrameworks) find_library(CARBON_LIBRARY Carbon) + find_library(COCOA_LIBRARY Cocoa) endif (DARWIN) @@ -25,6 +26,22 @@ set(SLPlugin_SOURCE_FILES slplugin.cpp ) +if (DARWIN) + list(APPEND SLPlugin_SOURCE_FILES + slplugin-objc.mm + ) + list(APPEND SLPlugin_HEADER_FILES + slplugin-objc.h + ) +endif (DARWIN) + +set_source_files_properties(${SLPlugin_HEADER_FILES} + PROPERTIES HEADER_FILE_ONLY TRUE) + +if (SLPlugin_HEADER_FILES) + list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES}) +endif (SLPlugin_HEADER_FILES) + add_executable(SLPlugin WIN32 MACOSX_BUNDLE @@ -51,7 +68,7 @@ add_dependencies(SLPlugin if (DARWIN) # Mac version needs to link against Carbon - target_link_libraries(SLPlugin ${CARBON_LIBRARY}) + target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY}) # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later) add_custom_command( TARGET SLPlugin POST_BUILD |