Skip to content

Fix unnecessary/restrictive public target flags #3126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nyoma-diamond wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −17
Draft

Fix unnecessary/restrictive public target flags #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions dlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ if (NOT TARGET dlib)

set(dlib_needed_public_libraries)
set(dlib_needed_public_includes)
set(dlib_needed_public_cflags)
set(dlib_needed_public_ldflags)
set(dlib_needed_private_cflags)
set(dlib_needed_private_ldflags)
set(dlib_needed_private_libraries)
set(dlib_needed_private_includes)

Expand Down Expand Up @@ -575,8 +575,8 @@ if (NOT TARGET dlib)
if (JXL_FOUND)
list (APPEND dlib_needed_private_includes ${JXL_INCLUDE_DIRS})
list (APPEND dlib_needed_private_libraries ${JXL_LIBRARIES})
list (APPEND dlib_needed_public_cflags ${JXL_CFLAGS})
list (APPEND dlib_needed_public_ldflags ${JXL_LDFLAGS})
list (APPEND dlib_needed_private_cflags ${JXL_CFLAGS})
list (APPEND dlib_needed_private_ldflags ${JXL_LDFLAGS})
set(source_files ${source_files}
image_loader/jxl_loader.cpp
image_saver/save_jxl.cpp
Expand Down Expand Up @@ -752,8 +752,8 @@ if (NOT TARGET dlib)
if (FFMPEG_FOUND)
list (APPEND dlib_needed_public_includes ${FFMPEG_INCLUDE_DIRS})
list (APPEND dlib_needed_public_libraries ${FFMPEG_LINK_LIBRARIES})
list (APPEND dlib_needed_public_cflags ${FFMPEG_CFLAGS})
list (APPEND dlib_needed_public_ldflags ${FFMPEG_LDFLAGS})
list (APPEND dlib_needed_private_cflags ${FFMPEG_CFLAGS})
list (APPEND dlib_needed_private_ldflags ${FFMPEG_LDFLAGS})
enable_preprocessor_switch(DLIB_USE_FFMPEG)
else()
set(DLIB_USE_FFMPEG OFF CACHE BOOL ${DLIB_USE_FFMPEG_STR} FORCE )
Expand All @@ -773,9 +773,9 @@ if (NOT TARGET dlib)
PUBLIC ${dlib_needed_public_includes}
PRIVATE ${dlib_needed_private_includes}
)
target_link_libraries(dlib PUBLIC ${dlib_needed_public_libraries} ${dlib_needed_public_ldflags})
target_link_libraries(dlib PRIVATE ${dlib_needed_private_libraries})
target_compile_options(dlib PUBLIC ${dlib_needed_public_cflags})
target_link_libraries(dlib PUBLIC ${dlib_needed_public_libraries})
target_link_libraries(dlib PRIVATE ${dlib_needed_private_libraries} ${dlib_needed_private_ldflags})
target_compile_options(dlib PRIVATE ${dlib_needed_private_cflags})
if (DLIB_IN_PROJECT_BUILD)
target_compile_options(dlib PUBLIC ${active_preprocessor_switches})
else()
Expand Down Expand Up @@ -806,13 +806,7 @@ if (NOT TARGET dlib)
endif()

target_compile_features(dlib PUBLIC cxx_std_14)
if((MSVC AND CMAKE_VERSION VERSION_LESS 3.11))
target_compile_options(dlib PUBLIC ${active_compile_opts})
target_compile_options(dlib PRIVATE ${active_compile_opts_private})
else()
target_compile_options(dlib PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${active_compile_opts}>)
target_compile_options(dlib PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${active_compile_opts_private}>)
endif()
target_compile_options(dlib PRIVATE ${active_compile_opts})

# Install the library
if (NOT DLIB_IN_PROJECT_BUILD)
Expand Down
2 changes: 1 addition & 1 deletion dlib/cmake_utils/set_compiler_specific_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if (MSVC)
# Build dlib with all cores. Don't propagate the setting to client programs
# though since they might compile large translation units that use too much
# RAM.
list(APPEND active_compile_opts_private "/MP")
list(APPEND active_compile_opts "/MP")

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.3)
# Clang can compile all Dlib's code at Windows platform. Tested with Clang 5
Expand Down
Loading