Bad merge resolution, fixed the build files that merged poorly.

--HG-- branch : gsoc2011-worldeditorqt
11 years ago · d86f150caa
parent 892ed1ed3d
commit d86f150caa
2 changed files with 4 additions and 2 deletions
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/CMakeLists.txt
@ -41,7 +41,7 @@ SOURCE_GROUP(QtGeneratedMocQrcSrc FILES ${OVQT_PLUGIN_LANDSCAPE_EDITOR_MOC_SRC}
 SOURCE_GROUP("Landscape Editor Plugin" FILES ${SRC})
 SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})

-ADD_LIBRARY(ovqt_plugin_landscape_editor MODULE ${SRC}
+ADD_LIBRARY(ovqt_plugin_landscape_editor SHARED ${SRC}
 						${OVQT_PLUGIN_LANDSCAPE_EDITOR_MOC_SRC} 
 						${OVQT_EXT_SYS_SRC}
 						${OVQT_PLUGIN_LANDSCAPE_EDITOR_UI_HDRS}
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/CMakeLists.txt
@ -65,4 +65,6 @@ NL_ADD_LIB_SUFFIX(ovqt_plugin_world_editor)

 ADD_DEFINITIONS(-DWORLD_EDITOR_LIBRARY ${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})

-INSTALL(TARGETS ovqt_plugin_world_editor LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
+INSTALL(TARGETS ovqt_plugin_world_editor LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} RUNTIME DESTINATION ${NL_BIN_PREFIX} ARCHIVE DESTINATION ${OVQT_PLUGIN_DIR} COMPONENT tools3d)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ovqt_plugin_world_editor.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
+