Prevent collisions between CMake and Autotools in examples/ and tests/.
Этот коммит содержится в:
родитель
042993b8eb
Коммит
bbbdf946a7
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
|
# Copyright (c) 2014, 2015 Alexander Lamaison <alexander.lamaison@gmail.com>
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms,
|
# Redistribution and use in source and binary forms,
|
||||||
# with or without modification, are permitted provided
|
# with or without modification, are permitted provided
|
||||||
@ -97,5 +97,5 @@ check_symbol_exists(__func__ "" HAVE___FUNC__)
|
|||||||
check_symbol_exists(__FUNCTION__ "" HAVE___FUNCTION__)
|
check_symbol_exists(__FUNCTION__ "" HAVE___FUNCTION__)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/libssh2_config.h.in
|
${CMAKE_CURRENT_SOURCE_DIR}/libssh2_config_cmake.h.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libssh2_config.h)
|
${CMAKE_CURRENT_BINARY_DIR}/libssh2_config.h)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
|
# Copyright (c) 2014, 2015 Alexander Lamaison <alexander.lamaison@gmail.com>
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms,
|
# Redistribution and use in source and binary forms,
|
||||||
# with or without modification, are permitted provided
|
# with or without modification, are permitted provided
|
||||||
@ -49,7 +49,7 @@ check_include_files(windows.h HAVE_WINDOWS_H)
|
|||||||
check_include_files(winsock2.h HAVE_WINSOCK2_H)
|
check_include_files(winsock2.h HAVE_WINSOCK2_H)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/libssh2_config.h.in
|
${CMAKE_CURRENT_SOURCE_DIR}/libssh2_config_cmake.h.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libssh2_config.h)
|
${CMAKE_CURRENT_BINARY_DIR}/libssh2_config.h)
|
||||||
|
|
||||||
set(TESTS
|
set(TESTS
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user