Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Okteta
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
Okteta
Commits
9e940500
Commit
9e940500
authored
Feb 28, 2015
by
Friedrich W. H. Kossebau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use OktetaGui instead of ${oktetagui_LIB}
parent
5177f9b3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
14 deletions
+11
-14
CMakeLists.txt
CMakeLists.txt
+0
-3
designer/CMakeLists.txt
designer/CMakeLists.txt
+1
-1
designer/examples/CMakeLists.txt
designer/examples/CMakeLists.txt
+1
-1
gui/CMakeLists.txt
gui/CMakeLists.txt
+7
-7
kasten/controllers/CMakeLists.txt
kasten/controllers/CMakeLists.txt
+1
-1
kasten/gui/CMakeLists.txt
kasten/gui/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
9e940500
...
...
@@ -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
}
)
...
...
designer/CMakeLists.txt
View file @
9e940500
...
...
@@ -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
...
...
designer/examples/CMakeLists.txt
View file @
9e940500
...
...
@@ -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
)
gui/CMakeLists.txt
View file @
9e940500
...
...
@@ -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
"$<BUILD_INTERFACE:
${
CMAKE_CURRENT_BINARY_DIR
}
/okteta>"
)
target_include_directories
(
OktetaGui
PUBLIC
"$<BUILD_INTERFACE:
${
CMAKE_CURRENT_BINARY_DIR
}
/okteta>"
)
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
}
...
...
kasten/controllers/CMakeLists.txt
View file @
9e940500
...
...
@@ -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
)
...
...
kasten/gui/CMakeLists.txt
View file @
9e940500
...
...
@@ -188,7 +188,7 @@ PUBLIC
${
oktetakastencore_LIB
}
${
KASTENGUI_LIBS
}
${
KASTENCORE_LIBS
}
${
oktetagui_LIB
}
OktetaGui
OktetaCore
PRIVATE
Qt5::Script
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment