Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 12:58:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Merge branch 'navmeshtool_lib' into 'master'
Some checks failed
Build and test / Ubuntu (push) Has been cancelled
Details
Build and test / MacOS (push) Has been cancelled
Details
Build and test / Read .env file and expose it as output (push) Has been cancelled
Details
Build and test / Windows (2019) (push) Has been cancelled
Details
Build and test / Windows (2022) (push) Has been cancelled
Details

Browse source 
Do not build navmeshtool translation units twice

See merge request OpenMW/openmw!4647
This commit is contained in:
Alexei Kotov 2025-04-25 21:40:57 +03:00
commit 011dfb305c
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/navmeshtool/CMakeLists.txt
View file

@ -1,20 +1,16 @@
set(NAVMESHTOOL set(NAVMESHTOOL_LIB
worldspacedata.cpp worldspacedata.cpp
navmesh.cpp navmesh.cpp
main.cpp
) )
source_group(apps\\navmeshtool FILES ${NAVMESHTOOL})
add_library(openmw-navmeshtool-lib STATIC source_group(apps\\navmeshtool FILES ${NAVMESHTOOL_LIB} main.cpp)
${NAVMESHTOOL}
) add_library(openmw-navmeshtool-lib STATIC ${NAVMESHTOOL_LIB})
if (ANDROID) if (ANDROID)
add_library(openmw-navmeshtool SHARED add_library(openmw-navmeshtool SHARED main.cpp)
main.cpp
)
else() else()
openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL}) openmw_add_executable(openmw-navmeshtool main.cpp)
endif() endif()
target_link_libraries(openmw-navmeshtool openmw-navmeshtool-lib) target_link_libraries(openmw-navmeshtool openmw-navmeshtool-lib)