Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
5435c56d
Commit
5435c56d
authored
Jan 07, 2016
by
Davis King
Browse files
Options
Browse Files
Download
Plain Diff
merged
parents
d73f58ae
6a641802
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
.hgtags
.hgtags
+1
-0
CMakeLists.txt
dlib/CMakeLists.txt
+3
-3
cmake
dlib/cmake
+1
-1
.logger_revnum
docs/.logger_revnum
+1
-1
No files found.
.hgtags
View file @
5435c56d
...
...
@@ -27,3 +27,4 @@ cae7fcc9e6a9b28b44a703e4598f44286fec734d v18.14
feaff82884ded598bde93c635eb3ded9c0933a07 v18.15
42a25c606cf924a8d41d2fc96b9c85f839d21a04 v18.16
ce6f364987865b19bdb1b4730ac5403e2bb55dc4 v18.17
7ae1775f61a44b7f07866050b50ad3ade581f019 v18.18
dlib/CMakeLists.txt
View file @
5435c56d
...
...
@@ -16,7 +16,7 @@ project(dlib)
set
(
CPACK_PACKAGE_VERSION_MAJOR
"18"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"18"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"
0
"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"
99
"
)
set
(
VERSION
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
)
set
(
CMAKE_LEGACY_CYGWIN_WIN32 0
)
# Remove when CMake >= 2.8.4 is required
...
...
@@ -432,11 +432,11 @@ if (NOT TARGET dlib)
REGEX
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
EXCLUDE
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/../dlib
/config.h.in
${
CMAKE_CURRENT_BINARY_DIR
}
/config.h
)
configure_file
(
${
PROJECT_SOURCE_DIR
}
/config.h.in
${
CMAKE_CURRENT_BINARY_DIR
}
/config.h
)
# overwrite config.h with the configured one
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/config.h DESTINATION include/dlib
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/../dlib
/revision.h.in
${
CMAKE_CURRENT_BINARY_DIR
}
/revision.h
)
configure_file
(
${
PROJECT_SOURCE_DIR
}
/revision.h.in
${
CMAKE_CURRENT_BINARY_DIR
}
/revision.h
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/revision.h DESTINATION include/dlib
)
install
(
FILES
"LICENSE.txt"
DESTINATION share/doc/dlib
)
...
...
dlib/cmake
View file @
5435c56d
# This is a CMake file meant to be included via include()
# It will trigger a compilation of dlib *in the project*
# including it
set(DLIB_IN_PROJECT_BUILD true)
cmake_minimum_required(VERSION 2.6.4)
set(DLIB_IN_PROJECT_BUILD true)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
if (POLICY CMP0054)
...
...
docs/.logger_revnum
View file @
5435c56d
ce6f36498786
0e51b2aaee97
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