Use OktetaCore instead of ${oktetacore_LIB}

parent 2fef640e
......@@ -100,9 +100,7 @@ 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( oktetacore_LIB oktetacore )
set( oktetagui_LIB oktetagui )
set( oktetacore_LIB_NAME okteta${OKTETALIBS_ABI_VERSION}core )
set( oktetagui_LIB_NAME okteta${OKTETALIBS_ABI_VERSION}gui )
set( OKTETALIBS_LIB_SOVERSION ${OKTETALIBS_ABI_VERSION} )
......
......@@ -105,11 +105,11 @@ ecm_generate_headers(oktetacore_LIB_CCHDRS
set( oktetacore_LIB_OBJS ${oktetacore_LIB_SRCS} )
add_library( ${oktetacore_LIB} SHARED ${oktetacore_LIB_OBJS} )
add_library( OktetaCore SHARED ${oktetacore_LIB_OBJS} )
generate_export_header( ${oktetacore_LIB} )
generate_export_header( OktetaCore )
target_link_libraries( ${oktetacore_LIB}
target_link_libraries( OktetaCore
PUBLIC
Qt5::Core
PRIVATE
......@@ -117,16 +117,16 @@ PRIVATE
KF5::Codecs #needed for codecs
)
target_include_directories(${oktetacore_LIB} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/okteta>")
target_include_directories(OktetaCore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/okteta>")
set_target_properties( ${oktetacore_LIB} PROPERTIES
set_target_properties( OktetaCore PROPERTIES
EXPORT_NAME "OktetaCore"
OUTPUT_NAME ${oktetacore_LIB_NAME}
OUTPUT_NAME okteta${OKTETALIBS_ABI_VERSION}core
VERSION ${OKTETACORE_VERSION}
SOVERSION ${OKTETACORE_SOVERSION}
)
install( TARGETS ${oktetacore_LIB} EXPORT OktetaCoreTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS OktetaCore EXPORT OktetaCoreTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES
${oktetacore_LIB_HDRS}
......
......@@ -69,7 +69,7 @@ ecm_add_test(
bytearraymodeltest.cpp
TEST_NAME bytearraymodeltest
NAME_PREFIX libokteta-core-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test
LINK_LIBRARIES OktetaCore Qt5::Test
)
......@@ -96,7 +96,7 @@ ecm_add_test(
piecetablebytearraymodelversionableiftest.cpp
TEST_NAME piecetablebytearraymodelversionableiftest
NAME_PREFIX libokteta-core-
LINK_LIBRARIES oktetacoretestutil ${oktetacore_LIB} Qt5::Test
LINK_LIBRARIES oktetacoretestutil OktetaCore Qt5::Test
)
......@@ -104,7 +104,7 @@ ecm_add_test(
valuecodectest.cpp
TEST_NAME valuecodectest
NAME_PREFIX libokteta-core-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test
LINK_LIBRARIES OktetaCore Qt5::Test
)
......@@ -112,7 +112,7 @@ ecm_add_test(
charcodectest.cpp
TEST_NAME charcodectest
NAME_PREFIX libokteta-core-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test KF5::I18n
LINK_LIBRARIES OktetaCore Qt5::Test KF5::I18n
)
......
......@@ -12,7 +12,7 @@ add_library( oktetadesignerplugin MODULE ${oktetadesignerplugin_SRCS} )
target_link_libraries( oktetadesignerplugin
${oktetagui_LIB}
${oktetacore_LIB}
OktetaCore
Qt5::Widgets
Qt5::Designer
)
......
......@@ -10,6 +10,6 @@ add_executable( oktetadesignerexample ${oktetadesignerexamplewidget_SRCS} )
target_link_libraries( oktetadesignerexample
${oktetagui_LIB}
${oktetacore_LIB}
OktetaCore
Qt5::Widgets
)
......@@ -132,7 +132,7 @@ generate_export_header( ${oktetagui_LIB} )
target_link_libraries( ${oktetagui_LIB}
PUBLIC
${oktetacore_LIB}
OktetaCore
Qt5::Widgets
PRIVATE
KF5::I18n
......
......@@ -20,20 +20,20 @@ ecm_add_test(
selectiontest.cpp
TEST_NAME selectiontest
NAME_PREFIX libokteta-gui-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test )
LINK_LIBRARIES OktetaCore Qt5::Test )
ecm_add_test(
coordtest.cpp
TEST_NAME coordtest
NAME_PREFIX libokteta-gui-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test )
LINK_LIBRARIES OktetaCore Qt5::Test )
ecm_add_test(
coordrangetest.cpp
TEST_NAME coordrangetest
NAME_PREFIX libokteta-gui-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test )
LINK_LIBRARIES OktetaCore Qt5::Test )
ecm_add_test(
......@@ -41,7 +41,7 @@ ecm_add_test(
coordrangelisttest.cpp
TEST_NAME coordrangelisttest
NAME_PREFIX libokteta-gui-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test )
LINK_LIBRARIES OktetaCore Qt5::Test )
ecm_add_test(
......@@ -49,7 +49,7 @@ ecm_add_test(
bytearraytablelayouttest.cpp
TEST_NAME bytearraytablelayouttest
NAME_PREFIX libokteta-gui-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test )
LINK_LIBRARIES OktetaCore Qt5::Test )
# FIXME:
# this is a rather stupid workaround - you should link to liboktetagui instead
set_tests_properties( libokteta-gui-bytearraytablelayouttest PROPERTIES COMPILE_FLAGS "-DMAKE_OKTETAGUI_LIB" )
......@@ -61,7 +61,7 @@ ecm_add_test(
bytearraytablecursortest.cpp
TEST_NAME bytearraytablecursortest
NAME_PREFIX libokteta-gui-
LINK_LIBRARIES ${oktetacore_LIB} Qt5::Test )
LINK_LIBRARIES OktetaCore Qt5::Test )
# FIXME:
# this is a rather stupid workaround - you should link to liboktetagui instead
set_tests_properties(libokteta-gui-bytearraytablecursortest PROPERTIES COMPILE_FLAGS "-DMAKE_OKTETAGUI_LIB" )
......
......@@ -369,7 +369,7 @@ set_target_properties( poddecoder-typeeditors PROPERTIES POSITION_INDEPENDENT_CO
target_link_libraries( poddecoder-typeeditors
PRIVATE
${oktetagui_LIB}
${oktetacore_LIB}
OktetaCore
KF5::Completion
)
......@@ -377,7 +377,7 @@ add_library( structview-tested-srcs STATIC ${STRUCTVIEW_TESTED_SRCS} )
set_target_properties( structview-tested-srcs PROPERTIES POSITION_INDEPENDENT_CODE TRUE )
target_link_libraries( structview-tested-srcs
PRIVATE
${oktetacore_LIB}
OktetaCore
KF5::ConfigGui
KF5::ConfigWidgets
KF5::I18n
......@@ -592,6 +592,6 @@ set( okteta_kastencontrollers_templates_SRCS
add_library( oktetakastencontrollertemplates STATIC ${okteta_kastencontrollers_templates_SRCS} )
# MSVC needs this
target_compile_definitions( oktetakastencontrollertemplates PUBLIC OKTETAKASTENCONTROLLERS_STATIC_DEFINE=1 )
target_link_libraries( oktetakastencontrollertemplates KF5::I18n Qt5::Widgets ${oktetacore_LIB} )
target_link_libraries( oktetakastencontrollertemplates KF5::I18n Qt5::Widgets OktetaCore )
endif( KASTEN_BUILD_INTERNAL_TEMPLATES )
......@@ -49,7 +49,7 @@ generate_export_header( ${oktetakastencore_LIB} )
target_link_libraries( ${oktetakastencore_LIB}
PUBLIC
${KASTENCORE_LIBS}
${oktetacore_LIB}
OktetaCore
PRIVATE
KF5::I18n
KF5::Bookmarks
......
......@@ -35,7 +35,7 @@ set( oktetakastenio_LIB_SRCS
)
add_library( oktetakastenio STATIC ${oktetakastenio_LIB_SRCS} )
target_link_libraries( oktetakastenio ${KASTENCORE_LIBS} oktetacore KF5::I18n KF5::CoreAddons Qt5::Core )
target_link_libraries( oktetakastenio ${KASTENCORE_LIBS} OktetaCore KF5::I18n KF5::CoreAddons Qt5::Core )
########### bytearrayrawfilesynchronizertest ###############
......
......@@ -189,7 +189,7 @@ PUBLIC
${KASTENGUI_LIBS}
${KASTENCORE_LIBS}
${oktetagui_LIB}
${oktetacore_LIB}
OktetaCore
PRIVATE
Qt5::Script
KF5::I18n
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment