Skip to content

Commit

Permalink
install dlls on bin and should install compiler specific libraries fo…
Browse files Browse the repository at this point in the history
…r examples app
  • Loading branch information
EddyTheCo committed Apr 7, 2024
1 parent 1ae452e commit f686270
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 1 deletion.
4 changes: 3 additions & 1 deletion QrDec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ if(NOT OpenCV_FOUND AND OpenCV_DOWNLOAD)
if(OpenCV_FOUND AND NOT ANDROID AND NOT EMSCRIPTEN)
install(IMPORTED_RUNTIME_ARTIFACTS ${OpenCV_LIBS}
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT QrDec
COMPONENT OpenCVDep
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT OpenCVDep
)
endif()
endif()
Expand All @@ -58,6 +59,7 @@ if(OpenCV_FOUND)
EXPORT ${PROJECT_NAME}-config
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT QrDec
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT QrDec
)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Esterv
Expand Down
1 change: 1 addition & 0 deletions QrGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ install(TARGETS QrGen
EXPORT ${PROJECT_NAME}-config
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT QrGen
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT QrGen
)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Esterv
Expand Down
2 changes: 2 additions & 0 deletions QtQrDec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ if (Qt6_FOUND AND TARGET QrDec)
EXPORT ${PROJECT_NAME}-config
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT QtQrDec
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT QtQrDec
)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Esterv
Expand All @@ -77,6 +78,7 @@ if (Qt6_FOUND AND TARGET QrDec)
EXPORT ${PROJECT_NAME}-config
DESTINATION ${CMAKE_INSTALL_LIBDIR}/Esterv/CustomControls/QrDec
COMPONENT QtQrDec
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT QtQrDec
)

if(EMSCRIPTEN)
Expand Down
1 change: 1 addition & 0 deletions QtQrDec/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
if(BUILD_EXAMPLES)
include(InstallRequiredSystemLibraries)
if(EMSCRIPTEN OR ANDROID)
find_package(Qt6 REQUIRED COMPONENTS QuickControls2)
find_package(EstervDesigns 0.4 REQUIRED COMPONENTS FlatControl CONFIG )
Expand Down
2 changes: 2 additions & 0 deletions QtQrGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ if (Qt6_FOUND AND TARGET QrGen)
EXPORT ${PROJECT_NAME}-config
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT QtQrGen
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT QtQrGen
)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Esterv
Expand All @@ -79,6 +80,7 @@ if (Qt6_FOUND AND TARGET QrGen)
EXPORT ${PROJECT_NAME}-config
DESTINATION ${CMAKE_INSTALL_LIBDIR}/Esterv/CustomControls/QrGen
COMPONENT QtQrGen
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT QtQrGen
)
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
add_subdirectory(examples)
Expand Down
1 change: 1 addition & 0 deletions QtQrGen/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
if(BUILD_EXAMPLES)
include(InstallRequiredSystemLibraries)
if(EMSCRIPTEN OR ANDROID)
find_package(Qt6 REQUIRED COMPONENTS QuickControls2)
find_package(EstervDesigns 0.4 REQUIRED COMPONENTS FlatControl CONFIG )
Expand Down

0 comments on commit f686270

Please sign in to comment.