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
655b7f7f
Commit
655b7f7f
authored
Feb 28, 2017
by
Davis King
Browse files
Switched cmake link names to dlib::dlib
parent
a62cf03c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
dlib/cmake_utils/add_python_module
dlib/cmake_utils/add_python_module
+1
-1
tools/htmlify/CMakeLists.txt
tools/htmlify/CMakeLists.txt
+1
-1
tools/imglab/CMakeLists.txt
tools/imglab/CMakeLists.txt
+1
-1
No files found.
dlib/cmake_utils/add_python_module
View file @
655b7f7f
...
@@ -147,7 +147,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake)
...
@@ -147,7 +147,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake)
# output name is set to what the user asked for (i.e. no _).
# output name is set to what the user asked for (i.e. no _).
macro(add_python_module module_name module_sources )
macro(add_python_module module_name module_sources )
ADD_LIBRARY(${module_name}_ SHARED ${module_sources} ${ARGN} )
ADD_LIBRARY(${module_name}_ SHARED ${module_sources} ${ARGN} )
TARGET_LINK_LIBRARIES(${module_name}_ ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} dlib)
TARGET_LINK_LIBRARIES(${module_name}_ ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}
dlib::
dlib)
if(WIN32 AND NOT CYGWIN)
if(WIN32 AND NOT CYGWIN)
SET_TARGET_PROPERTIES( ${module_name}_
SET_TARGET_PROPERTIES( ${module_name}_
PROPERTIES
PROPERTIES
...
...
tools/htmlify/CMakeLists.txt
View file @
655b7f7f
...
@@ -19,7 +19,7 @@ ADD_EXECUTABLE(${target_name}
...
@@ -19,7 +19,7 @@ ADD_EXECUTABLE(${target_name}
# Tell cmake to link our target executable to dlib.
# Tell cmake to link our target executable to dlib.
include
(
../../dlib/cmake
)
include
(
../../dlib/cmake
)
TARGET_LINK_LIBRARIES
(
${
target_name
}
dlib
)
TARGET_LINK_LIBRARIES
(
${
target_name
}
dlib
::dlib
)
...
...
tools/imglab/CMakeLists.txt
View file @
655b7f7f
...
@@ -30,7 +30,7 @@ ADD_EXECUTABLE(${target_name}
...
@@ -30,7 +30,7 @@ ADD_EXECUTABLE(${target_name}
# Tell cmake to link our target executable to dlib.
# Tell cmake to link our target executable to dlib.
TARGET_LINK_LIBRARIES
(
${
target_name
}
dlib
)
TARGET_LINK_LIBRARIES
(
${
target_name
}
dlib
::dlib
)
INSTALL
(
TARGETS
${
target_name
}
INSTALL
(
TARGETS
${
target_name
}
...
...
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