mirror of
https://github.com/OpenMW/openmw.git
synced 2025-05-21 08:41:31 +00:00
Merge branch 'fix_components_property' into 'master'
Set components property after it is defined See merge request OpenMW/openmw!3899
This commit is contained in:
commit
6d35b626cf
1 changed files with 4 additions and 4 deletions
|
@ -526,16 +526,16 @@ if (USE_QT)
|
||||||
QT_WRAP_UI(ESM_UI_HDR ${ESM_UI})
|
QT_WRAP_UI(ESM_UI_HDR ${ESM_UI})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ANDROID)
|
|
||||||
set_property(TARGET components PROPERTY POSTION_INDEPENDENT_CODE ON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
|
include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
find_package(SQLite3 REQUIRED)
|
find_package(SQLite3 REQUIRED)
|
||||||
|
|
||||||
add_library(components STATIC ${COMPONENT_FILES})
|
add_library(components STATIC ${COMPONENT_FILES})
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
set_property(TARGET components PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
target_link_libraries(components
|
target_link_libraries(components
|
||||||
${COLLADA_DOM_LIBRARIES}
|
${COLLADA_DOM_LIBRARIES}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue