Commit 1c6b1407 authored by Manuel Grizonnet's avatar Manuel Grizonnet

Merge branch '1685-rename-qgis-module' into 'develop'

Resolve "Module which generates QGIS descriptor is called Qgis while the source directory is QGIS (upper case)"

Closes #1685

See merge request orfeotoolbox/otb!196
parents 0a957d7c a0876803
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
project(OTBQgis) project(OTBQGIS)
otb_module_impl() otb_module_impl()
...@@ -20,15 +20,14 @@ ...@@ -20,15 +20,14 @@
set(DOCUMENTATION "This module allows to generate application descriptor files for QGIS processing plugin.") set(DOCUMENTATION "This module allows to generate application descriptor files for QGIS processing plugin.")
otb_module(OTBQgis otb_module(OTBQGIS
DEPENDS DEPENDS
OTBITK OTBITK
OTBApplicationEngine OTBApplicationEngine
TEST_DEPENDS TEST_DEPENDS
OTBTestKernel OTBTestKernel
DESCRIPTION DESCRIPTION
"${DOCUMENTATION}" "${DOCUMENTATION}"
) )
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# limitations under the License. # limitations under the License.
add_executable(otbQgisDescriptor otbQgisDescriptor.cxx) add_executable(otbQgisDescriptor otbQgisDescriptor.cxx)
target_link_libraries(otbQgisDescriptor ${OTBQgis_LIBRARIES}) target_link_libraries(otbQgisDescriptor ${OTBQGIS_LIBRARIES})
otb_module_target(otbQgisDescriptor) otb_module_target(otbQgisDescriptor)
add_custom_command(TARGET otbQgisDescriptor PRE_BUILD add_custom_command(TARGET otbQgisDescriptor PRE_BUILD
...@@ -53,4 +53,3 @@ endforeach() ...@@ -53,4 +53,3 @@ endforeach()
add_custom_target(generate_descriptors DEPENDS ${dfiles} ) add_custom_target(generate_descriptors DEPENDS ${dfiles} )
add_dependencies(${otb-module}-all generate_descriptors) add_dependencies(${otb-module}-all generate_descriptors)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment