Skip to content

Commit 011dfb3

Browse files
committed
Merge branch 'navmeshtool_lib' into 'master'
Do not build navmeshtool translation units twice See merge request OpenMW/openmw!4647
2 parents 80d6f02 + fc4cc32 commit 011dfb3

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

apps/navmeshtool/CMakeLists.txt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
set(NAVMESHTOOL
1+
set(NAVMESHTOOL_LIB
22
worldspacedata.cpp
33
navmesh.cpp
4-
main.cpp
54
)
6-
source_group(apps\\navmeshtool FILES ${NAVMESHTOOL})
75

8-
add_library(openmw-navmeshtool-lib STATIC
9-
${NAVMESHTOOL}
10-
)
6+
source_group(apps\\navmeshtool FILES ${NAVMESHTOOL_LIB} main.cpp)
7+
8+
add_library(openmw-navmeshtool-lib STATIC ${NAVMESHTOOL_LIB})
119

1210
if (ANDROID)
13-
add_library(openmw-navmeshtool SHARED
14-
main.cpp
15-
)
11+
add_library(openmw-navmeshtool SHARED main.cpp)
1612
else()
17-
openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL})
13+
openmw_add_executable(openmw-navmeshtool main.cpp)
1814
endif()
1915

2016
target_link_libraries(openmw-navmeshtool openmw-navmeshtool-lib)

0 commit comments

Comments
 (0)