diff options
| author | Alexei Kotov <alexdobrohotov@yandex.ru> | 2024-02-23 12:41:36 +0000 |
|---|---|---|
| committer | Alexei Kotov <alexdobrohotov@yandex.ru> | 2024-02-23 12:41:36 +0000 |
| commit | 6d35b626cf5f3efac7748d9a5b697f12a780176b (patch) | |
| tree | 5aa0a9c89e431b3e570e9df1999f05838a309c7b | |
| parent | cd4845ff0887df74f950b48a080e1a96119ec7a8 (diff) | |
| parent | 38990b1fd227acca441c98296a9841f878c559a2 (diff) | |
Merge branch 'fix_components_property' into 'master'
Set components property after it is defined
See merge request OpenMW/openmw!3899
| -rw-r--r-- | components/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index dc195d8d0b..6ab7fc4795 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -526,16 +526,16 @@ if (USE_QT) QT_WRAP_UI(ESM_UI_HDR ${ESM_UI}) endif() -if (ANDROID) - set_property(TARGET components PROPERTY POSTION_INDEPENDENT_CODE ON) -endif() - include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) find_package(SQLite3 REQUIRED) add_library(components STATIC ${COMPONENT_FILES}) +if (ANDROID) + set_property(TARGET components PROPERTY POSITION_INDEPENDENT_CODE ON) +endif() + target_link_libraries(components ${COLLADA_DOM_LIBRARIES} |