wbrawner/pihelper-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CMake warnings and misuse of HINTS

Browse source 
Signed-off-by: William Brawner <me@wbrawner.com>
This commit is contained in:
William Brawner 2020-05-22 18:30:16 -07:00
parent dede462d98
commit 1ccf58ecf0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/CMakeLists.txt
View file

@ -29,7 +29,7 @@ if (NOT TARGET CURL)
find_library( find_library(
CURL CURL
NAMES curl libcurl NAMES curl libcurl
HINTS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 /lib
) )
if (NOT CURL) if (NOT CURL)
message(SEND_ERROR "Did not find curl") message(SEND_ERROR "Did not find curl")
@ -39,7 +39,7 @@ if (NOT TARGET JSONC)
find_library( find_library(
JSONC JSONC
NAMES json-c libjson-c NAMES json-c libjson-c
HINTS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 /lib
) )
if (NOT JSONC) if (NOT JSONC)
message(SEND_ERROR "Did not find json-c") message(SEND_ERROR "Did not find json-c")
@ -49,7 +49,7 @@ if (NOT TARGET CRYPTO)
find_library( find_library(
CRYPTO CRYPTO
NAMES crypto libcrypto NAMES crypto libcrypto
HINTS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 /lib
) )
if (NOT CRYPTO) if (NOT CRYPTO)
message(SEND_ERROR "Did not find OpenSSL") message(SEND_ERROR "Did not find OpenSSL")
@ -59,7 +59,7 @@ if (NOT TARGET OPENSSL)
find_library( find_library(
OPENSSL OPENSSL
NAMES ssl libssl NAMES ssl libssl
HINTS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64 /lib
) )
if (NOT OPENSSL) if (NOT OPENSSL)
message(SEND_ERROR "Did not find OpenSSL") message(SEND_ERROR "Did not find OpenSSL")
@ -79,8 +79,10 @@ if (PIHELPER_STATIC)
set_target_properties(libpihelperstatic PROPERTIES OUTPUT_NAME "pihelper" set_target_properties(libpihelperstatic PROPERTIES OUTPUT_NAME "pihelper"
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
PUBLIC_HEADER pihelper.h
) )
if (PIHELPER_DEV)
set_target_properties(libpihelperstatic PROPERTIES PUBLIC_HEADER pihelper.h)
endif()
target_link_libraries(libpihelperstatic ${CURL} target_link_libraries(libpihelperstatic ${CURL}
${JSONC} ${JSONC}