diff options
author | Oz Linden <oz@lindenlab.com> | 2012-12-13 15:29:07 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-12-13 15:29:07 -0500 |
commit | 8e99b826457ab0161c12e11e7b5465ce6a3d10f3 (patch) | |
tree | 0b85b38d63fe13e0363076befd5784f351c23409 /indra/llvfs/CMakeLists.txt | |
parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
parent | e2bd5f7a9d8f5b967954c3e0bc97e662f7149af7 (diff) |
merge changes for DRTVWR-244
Diffstat (limited to 'indra/llvfs/CMakeLists.txt')
-rw-r--r-- | indra/llvfs/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt index a819d12861..3c68b279f7 100644 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt @@ -36,6 +36,8 @@ set(llvfs_HEADER_FILES if (DARWIN) LIST(APPEND llvfs_SOURCE_FILES lldir_mac.cpp) LIST(APPEND llvfs_HEADER_FILES lldir_mac.h) + LIST(APPEND llvfs_SOURCE_FILES llvfs_objc.mm) + LIST(APPEND llvfs_HEADER_FILES llvfs_objc.h) endif (DARWIN) if (LINUX) @@ -73,8 +75,8 @@ target_link_libraries(llvfs if (DARWIN) include(CMakeFindFrameworks) - find_library(CARBON_LIBRARY Carbon) - target_link_libraries(llvfs ${CARBON_LIBRARY}) + find_library(COCOA_LIBRARY Cocoa) + target_link_libraries(llvfs ${COCOA_LIBRARY}) endif (DARWIN) |