diff options
| author | Ryo Nakamura <upa@haeena.net> | 2024-02-04 18:39:19 +0900 |
|---|---|---|
| committer | Ryo Nakamura <upa@haeena.net> | 2024-02-04 20:23:08 +0900 |
| commit | c95e6a4fffe935330b4018e49f95fff5ad2cc551 (patch) | |
| tree | 0620e4e817fa2c381f42f7d2ec4234061c0f07c1 /CMakeLists.txt | |
| parent | 304e71d5a0420c5293d233add7408a21c173ddfd (diff) | |
do not passing msg_fp via mscp opts
instead, mpr_* functions print messages to stdout or stderr directly.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3823291..f99f26b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,12 +69,12 @@ add_subdirectory(libssh EXCLUDE_FROM_ALL) # setup mscp compile options -set(MSCP_COMPILE_OPTS -iquote ${CMAKE_CURRENT_BINARY_DIR}/libssh/include) -set(MSCP_BUILD_INCLUDE_DIRS +list(APPEND MSCP_COMPILE_OPTS -iquote ${CMAKE_CURRENT_BINARY_DIR}/libssh/include) +list(APPEND MSCP_BUILD_INCLUDE_DIRS ${mscp_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/libssh/include) -set(MSCP_LINK_LIBS ssh-static) +list(APPEND MSCP_LINK_LIBS ssh-static) if(BUILD_CONAN) find_package(ZLIB REQUIRED) find_package(OpenSSL REQUIRED) @@ -83,14 +83,20 @@ if(BUILD_CONAN) endif() -# generate version header file +# Symbol check +check_symbol_exists(strlcat string.h HAVE_STRLCAT) + +# generate config.h in build dir configure_file( - ${mscp_SOURCE_DIR}/include/mscp_version.h.in - ${mscp_SOURCE_DIR}/include/mscp_version.h) + ${mscp_SOURCE_DIR}/include/config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/include/config.h) +list(APPEND MSCP_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/include) + # libmscp.a set(LIBMSCP_SRC - src/mscp.c src/ssh.c src/fileops.c src/path.c src/platform.c src/message.c) + src/mscp.c src/ssh.c src/fileops.c src/path.c src/platform.c src/message.c + src/openbsd-compat/strlcat.c) add_library(mscp-static STATIC ${LIBMSCP_SRC}) target_include_directories(mscp-static PRIVATE ${MSCP_BUILD_INCLUDE_DIRS} ${mscp_SOURCE_DIR}/include) |