shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-12 03:00:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Use target_include_directories()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
Andreas Schneider
2019-11-05 08:50:12 +01:00
parent 29d360dc70
commit 5e2788d4c5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@@ -295,11 +295,6 @@ if (NOT WITH_NACL)
endif (NOT HAVE_OPENSSL_ED25519) endif (NOT HAVE_OPENSSL_ED25519)
endif (NOT WITH_NACL) endif (NOT WITH_NACL)
include_directories(
${LIBSSH_PUBLIC_INCLUDE_DIRS}
${LIBSSH_PRIVATE_INCLUDE_DIRS}
)
# Set the path to the default map file # Set the path to the default map file
set(MAP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.map") set(MAP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.map")
@@ -336,6 +331,8 @@ target_compile_options(${LIBSSH_SHARED_LIBRARY}
PRIVATE PRIVATE
${DEFAULT_C_COMPILE_FLAGS} ${DEFAULT_C_COMPILE_FLAGS}
-D_GNU_SOURCE) -D_GNU_SOURCE)
target_include_directories(${LIBSSH_SHARED_LIBRARY}
PRIVATE ${LIBSSH_PUBLIC_INCLUDE_DIRS} ${LIBSSH_PRIVATE_INCLUDE_DIRS})
target_link_libraries(${LIBSSH_SHARED_LIBRARY} target_link_libraries(${LIBSSH_SHARED_LIBRARY}
PRIVATE ${LIBSSH_LINK_LIBRARIES}) PRIVATE ${LIBSSH_LINK_LIBRARIES})
@@ -390,6 +387,8 @@ if (BUILD_STATIC_LIB)
${DEFAULT_C_COMPILE_FLAGS} ${DEFAULT_C_COMPILE_FLAGS}
-D_GNU_SOURCE) -D_GNU_SOURCE)
target_include_directories(${LIBSSH_STATIC_LIBRARY}
PRIVATE ${LIBSSH_PUBLIC_INCLUDE_DIRS} ${LIBSSH_PRIVATE_INCLUDE_DIRS})
target_link_libraries(${LIBSSH_STATIC_LIBRARY} target_link_libraries(${LIBSSH_STATIC_LIBRARY}
PUBLIC ${LIBSSH_LINK_LIBRARIES}) PUBLIC ${LIBSSH_LINK_LIBRARIES})