This repository was archived by the owner on Oct 10, 2022. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -34,12 +34,15 @@ function(add_driver)
3434 set (disabled_drivers ${disabled_drivers} ${add_driver_NAME} CACHE INTERNAL "" )
3535 return ()
3636 endif ()
37- configure_file (${CMAKE_CURRENT_SOURCE_DIR} /driver.json ${CMAKE_CURRENT_BINARY_DIR} /driver_${add_driver_NAME}.json )
37+ set (DRIVER_JSON_FILE ${CMAKE_CURRENT_BINARY_DIR} /driver_${add_driver_NAME} .json)
38+
39+ configure_file (${CMAKE_CURRENT_SOURCE_DIR} /driver.json ${DRIVER_JSON_FILE} )
3840 add_library (${add_driver_NAME} MODULE ${add_driver_SRCS} )
3941 target_link_libraries (${add_driver_NAME} GuLinux_Qt_Commons GuLinux_c++_Commons drivers planetaryimager-commons ${add_driver_LINK} Qt5::Core Qt5::Qml ${OpenCV_LIBS} )
4042
4143 set_target_properties (${add_driver_NAME} PROPERTIES PREFIX "driver_" )
44+
45+ install (FILES ${DRIVER_JSON_FILE} DESTINATION ${drivers_destination} )
4246 install (TARGETS ${add_driver_NAME} LIBRARY DESTINATION ${drivers_destination} )
43- install (FILES ${CMAKE_CURRENT_BINARY_DIR} /${add_driver_NAME} .json DESTINATION ${drivers_destination} )
4447 set (enabled_drivers ${enabled_drivers} ${add_driver_NAME} CACHE INTERNAL "" )
4548endfunction ()
Original file line number Diff line number Diff line change @@ -5,6 +5,8 @@ set(PlanetaryImager_SRCS planetaryimager_main.cpp ${PlanetaryImager_GUI_SRCS})
55
66set (drivers_destination lib/${CMAKE_PROJECT_NAME} /drivers)
77set (binary_destination bin)
8+ set (CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
9+
810if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
911 set (drivers_destination drivers)
1012 set (binary_destination .)
You can’t perform that action at this time.
0 commit comments