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
9e79eb2a
"tests/vscode:/vscode.git/clone" did not exist on "f4c79f7f6df5cb84c3479918f8c756eee3bf9713"
Commit
9e79eb2a
authored
Sep 12, 2015
by
Séverin Lemaignan
Browse files
Prevent compilation (and installation) of shared lib when dlib included via dlib/cmake
parent
6ef9c2ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+3
-3
dlib/cmake
dlib/cmake
+3
-0
No files found.
dlib/CMakeLists.txt
View file @
9e79eb2a
...
...
@@ -120,7 +120,7 @@ if (NOT TARGET dlib)
if
(
DLIB_ISO_CPP_ONLY
)
add_library
(
dlib STATIC
${
source_files
}
)
if
(
RELEASE_MODE
)
if
(
RELEASE_MODE
AND NOT DLIB_IN_PROJECT_BUILD
)
add_library
(
dlib-shared SHARED
${
source_files
}
)
endif
()
else
()
...
...
@@ -419,7 +419,7 @@ if (NOT TARGET dlib)
add_library
(
dlib STATIC
${
source_files
}
)
target_link_libraries
(
dlib
${
dlib_needed_libraries
}
)
if
(
RELEASE_MODE
)
if
(
RELEASE_MODE
AND NOT DLIB_IN_PROJECT_BUILD
)
add_library
(
dlib-shared SHARED
${
source_files
}
)
target_link_libraries
(
dlib-shared
${
dlib_needed_libraries
}
)
endif
()
...
...
@@ -427,7 +427,7 @@ if (NOT TARGET dlib)
endif
()
##### end of if NOT DLIB_ISO_CPP_ONLY ##########################################################
# Install the library
if
(
RELEASE_MODE
)
if
(
RELEASE_MODE
AND NOT DLIB_IN_PROJECT_BUILD
)
set_target_properties
(
dlib-shared PROPERTIES
OUTPUT_NAME dlib
VERSION
${
VERSION
}
)
...
...
dlib/cmake
View file @
9e79eb2a
# This is a CMake file meant to be included via include()
# It will trigger a compilation of dlib *in the project*
# including it
set(DLIB_IN_PROJECT_BUILD true)
cmake_minimum_required(VERSION 2.6.4)
...
...
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