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
96e91291
Commit
96e91291
authored
Feb 03, 2016
by
Davis King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made the python build get a DLIB_VERSION macro defined. Also cleaned up cmake
a little bit.
parent
b6b62fa2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
CMakeLists.txt
dlib/CMakeLists.txt
+2
-6
CMakeLists.txt
tools/python/CMakeLists.txt
+2
-0
No files found.
dlib/CMakeLists.txt
View file @
96e91291
...
@@ -3,11 +3,7 @@
...
@@ -3,11 +3,7 @@
# information about it at http://www.cmake.org
# information about it at http://www.cmake.org
#
#
# setting this makes CMake allow normal looking if else statements
cmake_minimum_required
(
VERSION 2.8.4
)
SET
(
CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true
)
cmake_minimum_required
(
VERSION 2.4
)
set
(
CMAKE_LEGACY_CYGWIN_WIN32 0
)
# Remove when CMake >= 2.8.4 is required
# default to a Release build (except if CMAKE_BUILD_TYPE is set)
# default to a Release build (except if CMAKE_BUILD_TYPE is set)
include
(
release_build_by_default
)
include
(
release_build_by_default
)
...
@@ -18,8 +14,8 @@ set(CPACK_PACKAGE_VERSION_MAJOR "18")
...
@@ -18,8 +14,8 @@ set(CPACK_PACKAGE_VERSION_MAJOR "18")
set
(
CPACK_PACKAGE_VERSION_MINOR
"18"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"18"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"99"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"99"
)
set
(
VERSION
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
)
set
(
VERSION
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
)
set
(
DLIB_VERSION
${
VERSION
}
PARENT_SCOPE
)
set
(
CMAKE_LEGACY_CYGWIN_WIN32 0
)
# Remove when CMake >= 2.8.4 is required
# Suppress cmake warnings about changes in new versions.
# Suppress cmake warnings about changes in new versions.
if
(
COMMAND cmake_policy
)
if
(
COMMAND cmake_policy
)
cmake_policy
(
SET CMP0003 NEW
)
cmake_policy
(
SET CMP0003 NEW
)
...
...
tools/python/CMakeLists.txt
View file @
96e91291
...
@@ -5,6 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4)
...
@@ -5,6 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4)
set
(
USE_SSE4_INSTRUCTIONS ON CACHE BOOL
"Use SSE4 instructions"
)
set
(
USE_SSE4_INSTRUCTIONS ON CACHE BOOL
"Use SSE4 instructions"
)
include
(
../../dlib/add_python_module
)
include
(
../../dlib/add_python_module
)
add_definitions
(
-DDLIB_VERSION=
${
DLIB_VERSION
}
)
# Tell cmake to compile all these cpp files into a dlib python module.
# Tell cmake to compile all these cpp files into a dlib python module.
set
(
python_srcs
set
(
python_srcs
src/dlib.cpp
src/dlib.cpp
...
...
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