Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Onuralp SEZER
Game Library
Commits
736a2a03
Commit
736a2a03
authored
2 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
attempt to fix exporting the static lib for imgui
parent
b17439e2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+7
-5
7 additions, 5 deletions
CMakeLists.txt
vendor/imgui/CMakeLists.txt
+5
-9
5 additions, 9 deletions
vendor/imgui/CMakeLists.txt
with
12 additions
and
14 deletions
CMakeLists.txt
+
7
−
5
View file @
736a2a03
...
...
@@ -131,13 +131,15 @@ install(FILES
DESTINATION
"
${
FGGL_CONFIG_PATH
}
"
)
# generate the export targets for the build tree
install
(
TARGETS
${
PROJECT_NAME
}
EXPORT fgglTargets
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
PUBLIC_HEADER DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/
${
PROJECT_NAME
}
INCLUDES DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
)
export
(
EXPORT
"
${
PROJECT_NAME
}
Targets"
FILE
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PROJECT_NAME
}
Targets.cmake"
NAMESPACE
${
namespace
}
::
)
install
(
TARGETS
${
PROJECT_NAME
}
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
PUBLIC_HEADER DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/
${
PROJECT_NAME
}
INCLUDES DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
)
This diff is collapsed.
Click to expand it.
vendor/imgui/CMakeLists.txt
+
5
−
9
View file @
736a2a03
...
...
@@ -11,6 +11,7 @@ set( IMGUI_SOURCES
add_library
(
imgui STATIC
${
IMGUI_SOURCES
}
)
set_property
(
TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON
)
set_target_properties
(
imgui PROPERTIES PUBLIC_HEADER include/*
)
target_include_directories
(
imgui
PUBLIC
...
...
@@ -19,14 +20,9 @@ target_include_directories( imgui
)
install
(
FILES
include/imconfig.h
include/imgui.h
include/imgui_internal.h
include/imstb_rectpack.h
include/imstb_textedit.h
include/imstb_truetype.h
TARGETS imgui
EXPORT fgglTargets
PUBLIC_HEADER
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/fggl/imgui
)
install
(
TARGETS imgui EXPORT fgglTargets
)
\ No newline at end of file
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment