From ddf4f8cb9c2c3caa668915b222cccca6bd5e0094 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 18 Sep 2018 17:11:01 +0200 Subject: Update vendor.cmake - add some more comments - made plugin include paths more generic --- plugins/ConfigurationEditor/CMakeLists.txt | 6 +++--- plugins/ProfileEditor/CMakeLists.txt | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/ConfigurationEditor/CMakeLists.txt b/plugins/ConfigurationEditor/CMakeLists.txt index 0df613f..22ef3d3 100644 --- a/plugins/ConfigurationEditor/CMakeLists.txt +++ b/plugins/ConfigurationEditor/CMakeLists.txt @@ -13,7 +13,7 @@ add_library(ConfigurationEditorPlugin SHARED ) target_include_directories(ConfigurationEditorPlugin - PRIVATE .. + PRIVATE ${CMAKE_SOURCE_DIR}/plugins PRIVATE ${CMAKE_SOURCE_DIR}/lib/configuration PRIVATE ${Boost_INCLUDE_DIRS} ) @@ -24,7 +24,7 @@ target_link_libraries(ConfigurationEditorPlugin ) if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - install(TARGETS ConfigurationEditorPlugin RUNTIME DESTINATION ${PLUGIN_DESTINATION} CONFIGURATIONS Release) + install(TARGETS ConfigurationEditorPlugin RUNTIME DESTINATION ${installPath_plugin} CONFIGURATIONS Release) else() - install(TARGETS ConfigurationEditorPlugin LIBRARY DESTINATION ${PLUGIN_DESTINATION} CONFIGURATIONS Release) + install(TARGETS ConfigurationEditorPlugin LIBRARY DESTINATION ${installPath_plugin} CONFIGURATIONS Release) endif() diff --git a/plugins/ProfileEditor/CMakeLists.txt b/plugins/ProfileEditor/CMakeLists.txt index 6237785..d22d3d6 100644 --- a/plugins/ProfileEditor/CMakeLists.txt +++ b/plugins/ProfileEditor/CMakeLists.txt @@ -23,8 +23,9 @@ add_library(ProfileEditorPlugin SHARED ) target_include_directories(ProfileEditorPlugin - PRIVATE .. - PRIVATE ../../lib/web) + PRIVATE ${CMAKE_SOURCE_DIR}/plugins + PRIVATE ${CMAKE_SOURCE_DIR}/lib/web +) target_link_libraries(ProfileEditorPlugin PRIVATE Qt5::Widgets @@ -33,7 +34,7 @@ target_link_libraries(ProfileEditorPlugin ) if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - install(TARGETS ProfileEditorPlugin RUNTIME DESTINATION ${PLUGIN_DESTINATION} CONFIGURATIONS Release) + install(TARGETS ProfileEditorPlugin RUNTIME DESTINATION ${installPath_plugin} CONFIGURATIONS Release) else() - install(TARGETS ProfileEditorPlugin LIBRARY DESTINATION ${PLUGIN_DESTINATION} CONFIGURATIONS Release) + install(TARGETS ProfileEditorPlugin LIBRARY DESTINATION ${installPath_plugin} CONFIGURATIONS Release) endif() -- cgit v1.2.1