Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
9e79eb2a
Commit
9e79eb2a
authored
9 years ago
by
Séverin Lemaignan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent compilation (and installation) of shared lib when dlib included via dlib/cmake
parent
6ef9c2ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
CMakeLists.txt
dlib/CMakeLists.txt
+3
-3
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
}
)
...
...
This diff is collapsed.
Click to expand it.
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)
...
...
This diff is collapsed.
Click to expand it.
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