OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent compilation (and installation) of shared lib when dlib included via dlib/cmake

This commit is contained in:
Séverin Lemaignan 2015-09-12 21:41:46 +01:00
parent 6ef9c2eee1
commit 9e79eb2a51
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlib/CMakeLists.txt
View File

@ -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})

3
dlib/cmake
View File

@ -1,4 +1,7 @@
# 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)