Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
diy2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Spiros Tsalikis
diy2
Commits
c80e3713
Commit
c80e3713
authored
4 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
cmake: install DLL files to the bin/ directory
This is where runtime libraries should live on Windows.
parent
370ed890
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+7
-1
7 additions, 1 deletion
CMakeLists.txt
with
7 additions
and
1 deletion
CMakeLists.txt
+
7
−
1
View file @
c80e3713
...
@@ -104,6 +104,9 @@ endif()
...
@@ -104,6 +104,9 @@ endif()
if
(
NOT DEFINED diy_install_include_dir
)
if
(
NOT DEFINED diy_install_include_dir
)
set
(
diy_install_include_dir
"include"
)
set
(
diy_install_include_dir
"include"
)
endif
()
endif
()
if
(
NOT DEFINED diy_install_bin_dir
)
set
(
diy_install_bin_dir
"bin"
)
endif
()
if
(
NOT DEFINED diy_install_lib_dir
)
if
(
NOT DEFINED diy_install_lib_dir
)
set
(
diy_install_lib_dir
"lib"
)
set
(
diy_install_lib_dir
"lib"
)
endif
()
endif
()
...
@@ -246,7 +249,10 @@ if (NOT DEFINED diy_install_only_libraries) # defined by parent project if build
...
@@ -246,7 +249,10 @@ if (NOT DEFINED diy_install_only_libraries) # defined by parent project if build
endif
()
endif
()
endif
()
endif
()
install
(
TARGETS
${
diy_targets
}
EXPORT
${
diy_export_name
}
DESTINATION
${
diy_install_lib_dir
}
)
install
(
TARGETS
${
diy_targets
}
EXPORT
${
diy_export_name
}
ARCHIVE DESTINATION
${
diy_install_lib_dir
}
LIBRARY DESTINATION
${
diy_install_lib_dir
}
RUNTIME DESTINATION
${
diy_install_bin_dir
}
)
if
(
CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR
)
# Only generate these files when diy is the main project
if
(
CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR
)
# Only generate these files when diy is the main project
export
(
EXPORT
${
diy_export_name
}
NAMESPACE DIY:: FILE
"
${
PROJECT_BINARY_DIR
}
/diy-targets.cmake"
)
export
(
EXPORT
${
diy_export_name
}
NAMESPACE DIY:: FILE
"
${
PROJECT_BINARY_DIR
}
/diy-targets.cmake"
)
...
...
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