diff --git a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt index 7a5a4a1b18d8c7d2a4371ae2731eda77352c9a49..f608da8a55bf98fc672d9c6aaee3a1b56b358fd0 100644 --- a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt +++ b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt @@ -8,11 +8,10 @@ add_executable(otbApplicationLauncherQt ${SRCS}) target_link_libraries(otbApplicationLauncherQt OTBWrapperQtWidget - OTBWrapperCore + OTBApplicationEngine ${QT_LIBRARIES}) - + install(TARGETS otbApplicationLauncherQt - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) - \ No newline at end of file + RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} + LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} + ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}) diff --git a/Code/Wrappers/CommandLine/CMakeLists.txt b/Code/Wrappers/CommandLine/CMakeLists.txt index 1c3ff348cb61bee4ee89d96e2063283d674c9c45..27a010cc013f56a3b23f7a18672dd5458b5df6ac 100644 --- a/Code/Wrappers/CommandLine/CMakeLists.txt +++ b/Code/Wrappers/CommandLine/CMakeLists.txt @@ -1,12 +1,9 @@ file(GLOB srcs "*.cxx") add_library(OTBWrapperCommandLine ${srcs}) -target_link_libraries(OTBWrapperCommandLine OTBWrapperCore) #OTBCommon OTBIO) -install(TARGETS OTBWrapperCommandLine - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) +target_link_libraries(OTBWrapperCommandLine OTBApplicationEngine) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include/otbapp - FILES_MATCHING PATTERN "*.h") - \ No newline at end of file +install(TARGETS OTBWrapperCommandLine + RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} + LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} + ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}) diff --git a/Code/Wrappers/QtWidget/CMakeLists.txt b/Code/Wrappers/QtWidget/CMakeLists.txt index b8b447bc24564f5bb9467a4730cb08fa8affe66a..beffa58cfa2ce6c71eff08f90a231a636395384c 100644 --- a/Code/Wrappers/QtWidget/CMakeLists.txt +++ b/Code/Wrappers/QtWidget/CMakeLists.txt @@ -21,13 +21,9 @@ set( WrappersQtWidget_MOC_HDR QT4_WRAP_CPP(WrappersQtWidget_MOC_SRC ${WrappersQtWidget_MOC_HDR}) add_library(OTBWrapperQtWidget ${srcs} ${WrappersQtWidget_MOC_SRC}) -target_link_libraries(OTBWrapperQtWidget OTBCommon OTBIO OTBWrapperCore OTBWrapperCommon ${QT_LIBRARIES}) +target_link_libraries(OTBWrapperQtWidget OTBApplicationEngine ${QT_LIBRARIES}) install(TARGETS OTBWrapperQtWidget - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) - -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include/otbapp - FILES_MATCHING PATTERN "*.h") - \ No newline at end of file + RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} + LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} + ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24})