Skip to content
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

Remove new cmake builtins #1116

Closed
wants to merge 2 commits into from
Closed

Remove new cmake builtins #1116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a5bda6
Attempt to remove too-new CMake builtins
michael-grunder Sep 15, 2022
b7d1322
Minor touchup
michael-grunder Sep 15, 2022
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
16 changes: 11 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SET(hiredis_sources
SET(hiredis_sources ${hiredis_sources})

IF(WIN32)
ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN")
ENDIF()

ADD_LIBRARY(hiredis SHARED ${hiredis_sources})
Expand Down Expand Up @@ -113,9 +113,12 @@ if (MSVC)
INSTALL(FILES $<TARGET_PDB_FILE:hiredis>
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug RelWithDebInfo)
INSTALL(FILES $<TARGET_FILE_DIR:hiredis_static>/$<TARGET_FILE_BASE_NAME:hiredis_static>.pdb
INSTALL(FILES $<TARGET_FILE_DIR:hiredis_static>/$<TARGET_NAME:hiredis_static>${CMAKE_DEBUG_POSTFIX}.pdb
DESTINATION ${CMAKE_INSTALL_LIBDIR}
CONFIGURATIONS Debug RelWithDebInfo)
CONFIGURATIONS Debug)
INSTALL(FILES $<TARGET_FILE_DIR:hiredis_static>/$<TARGET_NAME:hiredis_static>${CMAKE_RELEASE_POSTFIX}.pdb
DESTINATION ${CMAKE_INSTALL_LIBDIR}
CONFIGURATIONS RelWithDebInfo Release)
endif()

# For NuGet packages
Expand Down Expand Up @@ -206,9 +209,12 @@ IF(ENABLE_SSL)
INSTALL(FILES $<TARGET_PDB_FILE:hiredis_ssl>
DESTINATION ${CMAKE_INSTALL_BINDIR}
CONFIGURATIONS Debug RelWithDebInfo)
INSTALL(FILES $<TARGET_FILE_DIR:hiredis_ssl_static>/$<TARGET_FILE_BASE_NAME:hiredis_ssl_static>.pdb
INSTALL(FILES $<TARGET_FILE_DIR:hiredis_ssl_static>/$<TARGET_NAME:hiredis_ssl_static>${CMAKE_DEBUG_POSTFIX}.pdb
DESTINATION ${CMAKE_INSTALL_LIBDIR}
CONFIGURATIONS Debug RelWithDebInfo)
CONFIGURATIONS Debug)
INSTALL(FILES $<TARGET_FILE_DIR:hiredis_ssl_static>/$<TARGET_NAME:hiredis_ssl_static>${CMAKE_RELEASE_POSTFIX}.pdb
DESTINATION ${CMAKE_INSTALL_LIBDIR}
CONFIGURATIONS RelWithDebInfo Release)
endif()

INSTALL(FILES hiredis_ssl.h
Expand Down