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
5ff02a2a
Commit
5ff02a2a
authored
Aug 18, 2014
by
Davis King
Browse files
Fixed the cmake files to avoid getting an error if the word cmake or various
other words appear in the file path to the source code.
parent
9069f30a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
dlib/add_python_module
dlib/add_python_module
+4
-4
dlib/cmake
dlib/cmake
+1
-1
No files found.
dlib/add_python_module
View file @
5ff02a2a
...
...
@@ -51,7 +51,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif()
# include dlib so we can link against it
string(REPLACE "add_python_module" "" dlib_path ${CMAKE_CURRENT_LIST_FILE})
string(
REGEX
REPLACE "add_python_module
$
" "" dlib_path ${CMAKE_CURRENT_LIST_FILE})
include(${dlib_path}/cmake)
# We put the extra _ on the end of the name just so it's possible to
...
...
@@ -86,7 +86,7 @@ macro(add_python_module module_name module_sources )
macro(install_${module_name}_to path)
# Determine the path to our CMakeLists.txt file.
string(REPLACE "CMakeLists.txt" "" base_path ${CMAKE_CURRENT_LIST_FILE})
string(
REGEX
REPLACE "CMakeLists.txt
$
" "" base_path ${CMAKE_CURRENT_LIST_FILE})
INSTALL(TARGETS ${module_name}_
DESTINATION "${base_path}/${path}"
)
...
...
@@ -97,8 +97,8 @@ macro(add_python_module module_name module_sources )
if (WIN32)
list(GET Boost_LIBRARIES 1 boostlibs1)
list(GET Boost_LIBRARIES 3 boostlibs2)
string(REPLACE ".lib" ".dll" boostdlls1 ${boostlibs1})
string(REPLACE ".lib" ".dll" boostdlls2 ${boostlibs2})
string(
REGEX
REPLACE ".lib
$
" ".dll" boostdlls1 ${boostlibs1})
string(
REGEX
REPLACE ".lib
$
" ".dll" boostdlls2 ${boostlibs2})
INSTALL(FILES ${boostdlls1} ${boostdlls2}
DESTINATION "${base_path}/${path}"
)
...
...
dlib/cmake
View file @
5ff02a2a
...
...
@@ -3,7 +3,7 @@
if (NOT TARGET dlib)
# Determine the path to dlib.
string(REPLACE "cmake" "" dlib_path ${CMAKE_CURRENT_LIST_FILE})
string(
REGEX
REPLACE "cmake
$
" "" dlib_path ${CMAKE_CURRENT_LIST_FILE})
if (CMAKE_COMPILER_IS_GNUCXX)
# By default, g++ won't warn or error if you forget to return a value in a
...
...
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