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
22d1cd22
Commit
22d1cd22
authored
Oct 18, 2015
by
Davis King
Browse files
Renamed dlib-shared to dlib_shared because the - was causing nvcc to get
confused when that name appeared on the command line.
parent
2c639d3a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+6
-6
No files found.
dlib/CMakeLists.txt
View file @
22d1cd22
...
...
@@ -136,7 +136,7 @@ if (NOT TARGET dlib)
if
(
DLIB_ISO_CPP_ONLY
)
add_library
(
dlib STATIC
${
source_files
}
)
if
(
UNIX AND NOT DLIB_IN_PROJECT_BUILD
)
add_library
(
dlib
-
shared SHARED
${
source_files
}
)
add_library
(
dlib
_
shared SHARED
${
source_files
}
)
endif
()
else
()
...
...
@@ -512,11 +512,11 @@ if (NOT TARGET dlib)
target_link_libraries
(
dlib
${
dlib_needed_libraries
}
)
if
(
UNIX AND NOT DLIB_IN_PROJECT_BUILD
)
if
(
DLIB_USE_CUDA
)
cuda_add_library
(
dlib
-
shared SHARED
${
source_files
}
)
cuda_add_library
(
dlib
_
shared SHARED
${
source_files
}
)
else
()
add_library
(
dlib
-
shared SHARED
${
source_files
}
)
add_library
(
dlib
_
shared SHARED
${
source_files
}
)
endif
()
target_link_libraries
(
dlib
-
shared
${
dlib_needed_libraries
}
)
target_link_libraries
(
dlib
_
shared
${
dlib_needed_libraries
}
)
endif
()
endif
()
##### end of if NOT DLIB_ISO_CPP_ONLY ##########################################################
...
...
@@ -525,10 +525,10 @@ if (NOT TARGET dlib)
if
(
NOT DLIB_IN_PROJECT_BUILD
)
cmake_minimum_required
(
VERSION 2.8.8
)
if
(
UNIX
)
set_target_properties
(
dlib
-
shared PROPERTIES
set_target_properties
(
dlib
_
shared PROPERTIES
OUTPUT_NAME dlib
VERSION
${
VERSION
}
)
install
(
TARGETS dlib dlib
-
shared
install
(
TARGETS dlib dlib
_
shared
EXPORT dlib
RUNTIME DESTINATION bin
# Windows (including cygwin) considers .dll to be runtime artifacts
LIBRARY DESTINATION lib
...
...
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