fbb5dced97
Conflicts: indra/llcommon/CMakeLists.txt indra/llmessage/llcurl.cpp indra/llmessage/llcurl.h indra/llmessage/llhttpclient.cpp indra/llmessage/llhttpclient.h indra/llmessage/llpumpio.cpp indra/llmessage/llpumpio.h indra/llmessage/llurlrequest.cpp indra/llmessage/llurlrequest.h indra/newview/hipporestrequest.cpp indra/newview/llappviewer.cpp indra/newview/llspatialpartition.cpp indra/newview/llviewermedia.cpp indra/newview/llxmlrpctransaction.cpp Conflicts resolved by choosing curlthreading2 for any llmessage file regardless (which looks correct upon investigation); the rest also turned out to need to use curlthreading2, except in one line where I added a semi-colon after an assert(), and the assert was changed in singu/master.
64 lines
1.3 KiB
CMake
64 lines
1.3 KiB
CMake
# -*- cmake -*-
|
|
|
|
project(statemachine)
|
|
|
|
include(00-Common)
|
|
include(LLCommon)
|
|
include(LLPlugin)
|
|
include(LLMessage)
|
|
include(LLMath)
|
|
include(LLVFS)
|
|
include(LLXML)
|
|
include(LLWindow)
|
|
include(LLUI)
|
|
include(LLRender)
|
|
include(LLImage)
|
|
include(LLCharacter)
|
|
include(LLInventory)
|
|
include(LLPrimitive)
|
|
|
|
include_directories(
|
|
${CMAKE_SOURCE_DIR}/newview
|
|
${LLCOMMON_INCLUDE_DIRS}
|
|
${LLPLUGIN_INCLUDE_DIRS}
|
|
${LLMESSAGE_INCLUDE_DIRS}
|
|
${LLMATH_INCLUDE_DIRS}
|
|
${LLVFS_INCLUDE_DIRS}
|
|
${LLXML_INCLUDE_DIRS}
|
|
${LLWINDOW_INCLUDE_DIRS}
|
|
${LLUI_INCLUDE_DIRS}
|
|
${LLRENDER_INCLUDE_DIRS}
|
|
${LLIMAGE_INCLUDE_DIRS}
|
|
${LLCHARACTER_INCLUDE_DIRS}
|
|
${LLINVENTORY_INCLUDE_DIRS}
|
|
${LLPRIMITIVE_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(statemachine_SOURCE_FILES
|
|
aistatemachine.cpp
|
|
aicurleasyrequeststatemachine.cpp
|
|
aifilepicker.cpp
|
|
aifetchinventoryfolder.cpp
|
|
aievent.cpp
|
|
aitimer.cpp
|
|
)
|
|
|
|
set(statemachine_HEADER_FILES
|
|
CMakeLists.txt
|
|
aistatemachine.h
|
|
aicurleasyrequeststatemachine.h
|
|
aifilepicker.h
|
|
aidirpicker.h
|
|
aifetchinventoryfolder.h
|
|
aievent.h
|
|
aitimer.h
|
|
)
|
|
|
|
set_source_files_properties(${statemachine_HEADER_FILES}
|
|
PROPERTIES HEADER_FILE_ONLY TRUE)
|
|
|
|
list(APPEND statemachine_SOURCE_FILES ${statemachine_HEADER_FILES})
|
|
|
|
add_library (statemachine ${statemachine_SOURCE_FILES})
|
|
add_dependencies(statemachine prepare)
|