Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
61687a8f
Commit
61687a8f
authored
May 24, 2018
by
Davis King
Browse files
merged
parents
c1f5f32b
f82aa1be
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+6
-1
No files found.
dlib/CMakeLists.txt
View file @
61687a8f
...
@@ -24,6 +24,7 @@ endif()
...
@@ -24,6 +24,7 @@ endif()
include
(
cmake_utils/release_build_by_default
)
include
(
cmake_utils/release_build_by_default
)
include
(
cmake_utils/use_cpp_11.cmake
)
include
(
cmake_utils/use_cpp_11.cmake
)
set
(
CPACK_PACKAGE_NAME
"dlib"
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
"19"
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
"19"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"12"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"12"
)
...
@@ -38,7 +39,6 @@ if(has_parent)
...
@@ -38,7 +39,6 @@ if(has_parent)
endif
()
endif
()
endif
()
endif
()
if
(
DLIB_IN_PROJECT_BUILD
)
if
(
DLIB_IN_PROJECT_BUILD
)
# Check if we are being built as part of a pybind11 module.
# Check if we are being built as part of a pybind11 module.
...
@@ -849,6 +849,11 @@ if (NOT TARGET dlib)
...
@@ -849,6 +849,11 @@ if (NOT TARGET dlib)
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/dlib-1.pc"
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/dlib-1.pc"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig"
)
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig"
)
# Add a cpack "package" target. This will create an archive containing
# the built library file, the header files, and cmake and pkgconfig
# configuration files.
include
(
CPack
)
endif
()
endif
()
endif
()
endif
()
...
...
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