From 9e940500d1ef8131718244f2349af1603e5a8ad9 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Sat, 28 Feb 2015 07:31:08 +0100 Subject: [PATCH] Use OktetaGui instead of ${oktetagui_LIB} --- CMakeLists.txt | 3 --- designer/CMakeLists.txt | 2 +- designer/examples/CMakeLists.txt | 2 +- gui/CMakeLists.txt | 14 +++++++------- kasten/controllers/CMakeLists.txt | 2 +- kasten/gui/CMakeLists.txt | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b62b92e1f..0da2611c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,9 +100,6 @@ set( OKTETALIBS_ABI_VERSION 2 ) set( OKTETALIBS_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/okteta ) #${OKTETALIBS_ABI_VERSION} ) set( OKTETALIBS_CCINCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/Okteta ) #${OKTETALIBS_ABI_VERSION} ) -set( oktetagui_LIB oktetagui ) -set( oktetagui_LIB_NAME okteta${OKTETALIBS_ABI_VERSION}gui ) - set( OKTETALIBS_LIB_SOVERSION ${OKTETALIBS_ABI_VERSION} ) set( OKTETALIBS_LIB_VERSION ${OKTETALIBS_VERSION} ) diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt index 6a3ab46ec..b686651b7 100644 --- a/designer/CMakeLists.txt +++ b/designer/CMakeLists.txt @@ -11,7 +11,7 @@ set( oktetadesignerplugin_SRCS add_library( oktetadesignerplugin MODULE ${oktetadesignerplugin_SRCS} ) target_link_libraries( oktetadesignerplugin - ${oktetagui_LIB} + OktetaGui OktetaCore Qt5::Widgets Qt5::Designer diff --git a/designer/examples/CMakeLists.txt b/designer/examples/CMakeLists.txt index 24ccbf51d..6a6bf87ac 100644 --- a/designer/examples/CMakeLists.txt +++ b/designer/examples/CMakeLists.txt @@ -9,7 +9,7 @@ qt5_wrap_ui( oktetadesignerexamplewidget_SRCS example_widget.ui ) add_executable( oktetadesignerexample ${oktetadesignerexamplewidget_SRCS} ) target_link_libraries( oktetadesignerexample - ${oktetagui_LIB} + OktetaGui OktetaCore Qt5::Widgets ) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 49e838c70..0a5c7a87d 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -126,11 +126,11 @@ ecm_generate_headers(oktetagui_LIB_CCHDRS REQUIRED_HEADERS oktetagui_LIB_HDRS ) -add_library( ${oktetagui_LIB} SHARED ${oktetagui_LIB_SRCS} ) +add_library( OktetaGui SHARED ${oktetagui_LIB_SRCS} ) -generate_export_header( ${oktetagui_LIB} ) +generate_export_header( OktetaGui ) -target_link_libraries( ${oktetagui_LIB} +target_link_libraries( OktetaGui PUBLIC OktetaCore Qt5::Widgets @@ -139,16 +139,16 @@ PRIVATE KF5::ConfigWidgets ) -target_include_directories(${oktetagui_LIB} PUBLIC "$") +target_include_directories(OktetaGui PUBLIC "$") -set_target_properties( ${oktetagui_LIB} PROPERTIES +set_target_properties( OktetaGui PROPERTIES EXPORT_NAME "OktetaGui" - OUTPUT_NAME ${oktetagui_LIB_NAME} + OUTPUT_NAME okteta${OKTETALIBS_ABI_VERSION}gui VERSION ${OKTETAGUI_VERSION} SOVERSION ${OKTETAGUI_SOVERSION} ) -install( TARGETS ${oktetagui_LIB} EXPORT OktetaGuiTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install( TARGETS OktetaGui EXPORT OktetaGuiTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES ${oktetagui_LIB_HDRS} DESTINATION ${OKTETALIBS_INCLUDE_INSTALL_DIR} diff --git a/kasten/controllers/CMakeLists.txt b/kasten/controllers/CMakeLists.txt index 06d60f847..74439fe44 100644 --- a/kasten/controllers/CMakeLists.txt +++ b/kasten/controllers/CMakeLists.txt @@ -368,7 +368,7 @@ add_library( poddecoder-typeeditors STATIC ${PODDECODER_TYPEEDITOR_SRCS} ) set_target_properties( poddecoder-typeeditors PROPERTIES POSITION_INDEPENDENT_CODE TRUE ) target_link_libraries( poddecoder-typeeditors PRIVATE - ${oktetagui_LIB} + OktetaGui OktetaCore KF5::Completion ) diff --git a/kasten/gui/CMakeLists.txt b/kasten/gui/CMakeLists.txt index 38642b42f..d49537ec8 100644 --- a/kasten/gui/CMakeLists.txt +++ b/kasten/gui/CMakeLists.txt @@ -188,7 +188,7 @@ PUBLIC ${oktetakastencore_LIB} ${KASTENGUI_LIBS} ${KASTENCORE_LIBS} - ${oktetagui_LIB} + OktetaGui OktetaCore PRIVATE Qt5::Script -- GitLab