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
6ed65bf3
Commit
6ed65bf3
authored
Feb 27, 2017
by
Davis King
Browse files
Fixed a few cmake errors, one regarding CUDA compilation and another
about the all/source.cpp test compile.
parent
974dc0cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+8
-7
No files found.
dlib/CMakeLists.txt
View file @
6ed65bf3
...
...
@@ -22,13 +22,10 @@ if(has_parent)
set
(
DLIB_VERSION
${
VERSION
}
PARENT_SCOPE
)
endif
()
# Suppress cmake warnings about changes in new versions.
if
(
COMMAND cmake_policy
)
cmake_policy
(
SET CMP0003 NEW
)
if
(
POLICY CMP0054
)
cmake_policy
(
SET CMP0054 NEW
)
endif
()
endif
()
# Set only because there are old target_link_libraries() statements in the
# FindCUDA.cmake file that comes with CMake that error out if the new behavior
# is used.
cmake_policy
(
SET CMP0023 OLD
)
include
(
cmake_utils/add_global_compiler_switch.cmake
)
...
...
@@ -634,6 +631,9 @@ if (NOT TARGET dlib)
# Tell CMake to build dlib via add_library()/cuda_add_library()
if
(
DLIB_USE_CUDA
)
# The old cuda_add_library() command doesn't support CMake's newer dependency
# stuff, so we have to set the include path manually still, which we do here.
include_directories
(
${
dlib_needed_includes
}
)
cuda_add_library
(
dlib STATIC
${
source_files
}
)
else
()
add_library
(
dlib STATIC
${
source_files
}
)
...
...
@@ -665,6 +665,7 @@ if (NOT TARGET dlib)
# Allow the unit tests to ask us to compile the all/source.cpp file just to make sure it compiles.
if
(
DLIB_TEST_COMPILE_ALL_SOURCE_CPP
)
ADD_LIBRARY
(
dlib_all_source_cpp STATIC all/source.cpp
)
target_link_libraries
(
dlib_all_source_cpp dlib
)
endif
()
# Install the library
...
...
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