Skip to content

Commit 7d92092

Browse files
authored
Merge pull request #1135 from clementperon/fix-external-cmake
Fix external cmake
2 parents bf8bfc7 + a43dbc2 commit 7d92092

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

CMakeLists.txt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3144,6 +3144,10 @@ if(BUILD_SHARED_LIBS)
31443144
${CMAKE_CURRENT_BINARY_DIR}/scanner.c
31453145
${PROJECT_EXTERNAL_OBJECT_LIST}
31463146
)
3147+
target_include_directories(${LIBRARY_NAME} PUBLIC
3148+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
3149+
$<INSTALL_INTERFACE:include>
3150+
)
31473151
add_dependencies(${LIBRARY_NAME} SerializeTarget)
31483152
set_target_properties(${LIBRARY_NAME} PROPERTIES
31493153
COMPILE_DEFINITIONS BUILDING_PCAP)
@@ -3169,6 +3173,10 @@ add_library(${LIBRARY_NAME}_static STATIC
31693173
${CMAKE_CURRENT_BINARY_DIR}/scanner.c
31703174
${PROJECT_EXTERNAL_OBJECT_LIST}
31713175
)
3176+
target_include_directories(${LIBRARY_NAME}_static PUBLIC
3177+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
3178+
$<INSTALL_INTERFACE:include>
3179+
)
31723180
add_dependencies(${LIBRARY_NAME}_static SerializeTarget)
31733181
set_target_properties(${LIBRARY_NAME}_static PROPERTIES
31743182
COMPILE_DEFINITIONS BUILDING_PCAP)
@@ -3293,21 +3301,21 @@ function(install_manpage_symlink SOURCE TARGET MANDIR)
32933301

32943302
install(CODE "
32953303
if(NOT ${CMAKE_INSTALL_MESSAGE} STREQUAL \"NEVER\")
3296-
message(STATUS \"Symlinking: \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
3304+
message(STATUS \"Symlinking: \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
32973305
endif()
32983306
execute_process(
32993307
COMMAND \"${CMAKE_COMMAND}\" \"-E\" \"remove\" \"${TARGET}\"
3300-
WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MANDIR}
3308+
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDIR}
33013309
)
33023310
execute_process(
33033311
COMMAND ${LINK_COMMAND}
3304-
WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MANDIR}
3312+
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDIR}
33053313
RESULT_VARIABLE EXIT_STATUS
33063314
)
33073315
if(NOT EXIT_STATUS EQUAL 0)
3308-
message(FATAL_ERROR \"Could not create symbolic link from ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
3316+
message(FATAL_ERROR \"Could not create symbolic link from \${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
33093317
endif()
3310-
set(CMAKE_INSTALL_MANIFEST_FILES \${CMAKE_INSTALL_MANIFEST_FILES} ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${TARGET})")
3318+
set(CMAKE_INSTALL_MANIFEST_FILES \${CMAKE_INSTALL_MANIFEST_FILES} \${CMAKE_INSTALL_PREFIX}/${MANDIR}/${TARGET})")
33113319
endfunction(install_manpage_symlink)
33123320

33133321
set(MAN1_NOEXPAND pcap-config.1)
@@ -3432,7 +3440,7 @@ if(WIN32 OR CYGWIN OR MSYS)
34323440
endif(MSVC)
34333441
endif(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
34343442
else(WIN32 OR CYGWIN OR MSYS)
3435-
install(TARGETS ${LIBRARIES_TO_INSTALL} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
3443+
install(TARGETS ${LIBRARIES_TO_INSTALL} DESTINATION ${CMAKE_INSTALL_LIBDIR})
34363444
endif(WIN32 OR CYGWIN OR MSYS)
34373445

34383446
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pcap/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pcap)

0 commit comments

Comments
 (0)