diff options
author | prep <prep@lindenlab.com> | 2013-03-11 15:17:13 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2013-03-11 15:17:13 -0400 |
commit | 8e3b190e919fde84a2189d974208f9d199d4bea6 (patch) | |
tree | 7ab1db96d291260cbad356533607e1bce36ed0a7 /indra/llvfs/CMakeLists.txt | |
parent | 2ea750ebcad8335aeb0ec77a483831b62d05f643 (diff) | |
parent | e0c9174609e2457fab7fe6d7291c6ebbd030397c (diff) |
merge
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 3c68b279f7..67dce8c073 100644 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt @@ -8,6 +8,7 @@ include(UnixInstall) include_directories( ${LLCOMMON_INCLUDE_DIRS} + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} ) set(llvfs_SOURCE_FILES @@ -44,12 +45,12 @@ if (LINUX) LIST(APPEND llvfs_SOURCE_FILES lldir_linux.cpp) LIST(APPEND llvfs_HEADER_FILES lldir_linux.h) - if (VIEWER AND INSTALL) + if (INSTALL) set_source_files_properties(lldir_linux.cpp PROPERTIES COMPILE_FLAGS "-DAPP_RO_DATA_DIR=\\\"${APP_SHARE_DIR}\\\"" ) - endif (VIEWER AND INSTALL) + endif (INSTALL) endif (LINUX) if (WINDOWS) @@ -70,6 +71,7 @@ set(vfs_BOOST_LIBRARIES ) target_link_libraries(llvfs + ${LLCOMMON_LIBRARIES} ${vfs_BOOST_LIBRARIES} ) |