41f13dbf46
Added missing header to indra/newview/ascentkeyword.cpp now that llviewerpluginmanager.h has a couple of header dependencies less. Resolved Conflicts: indra/llcommon/CMakeLists.txt Proximity: addition of two independent things. Just included both.
59 lines
1.0 KiB
CMake
59 lines
1.0 KiB
CMake
# -*- cmake -*-
|
|
|
|
project(media_plugin_base)
|
|
|
|
include(00-Common)
|
|
include(LLCommon)
|
|
include(LLImage)
|
|
include(LLPlugin)
|
|
include(LLMath)
|
|
include(LLRender)
|
|
include(LLWindow)
|
|
include(Linking)
|
|
include(PluginAPI)
|
|
include(FindOpenGL)
|
|
include(BasicPluginBase)
|
|
|
|
include_directories(
|
|
${LLPLUGIN_INCLUDE_DIRS}
|
|
${LLCOMMON_INCLUDE_DIRS}
|
|
${LLMATH_INCLUDE_DIRS}
|
|
${LLIMAGE_INCLUDE_DIRS}
|
|
${LLRENDER_INCLUDE_DIRS}
|
|
${LLWINDOW_INCLUDE_DIRS}
|
|
${BASIC_PLUGIN_BASE_INCLUDE_DIRS}
|
|
)
|
|
|
|
### media_plugin_base
|
|
|
|
if(NOT WORD_SIZE EQUAL 32)
|
|
if(WINDOWS)
|
|
add_definitions(/FIXED:NO)
|
|
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
|
|
add_definitions(-fPIC)
|
|
endif(WINDOWS)
|
|
endif (NOT WORD_SIZE EQUAL 32)
|
|
|
|
set(media_plugin_base_SOURCE_FILES
|
|
media_plugin_base.cpp
|
|
)
|
|
|
|
set(media_plugin_base_HEADER_FILES
|
|
CMakeLists.txt
|
|
|
|
media_plugin_base.h
|
|
)
|
|
|
|
add_library(media_plugin_base
|
|
${media_plugin_base_SOURCE_FILES}
|
|
)
|
|
|
|
target_link_libraries(media_plugin_base
|
|
${BASIC_PLUGIN_BASE_LIBRARIES}
|
|
)
|
|
|
|
add_dependencies(media_plugin_base
|
|
${BASIC_PLUGIN_BASE_LIBRARIES}
|
|
)
|
|
|