From bbbdf946a725e6d349a4e47d4c9cdd997295e25c Mon Sep 17 00:00:00 2001 From: Alexander Lamaison Date: Fri, 13 Mar 2015 07:47:41 +0000 Subject: [PATCH] Prevent collisions between CMake and Autotools in examples/ and tests/. --- example/CMakeLists.txt | 4 ++-- example/{libssh2_config.h.in => libssh2_config_cmake.h.in} | 0 tests/CMakeLists.txt | 4 ++-- tests/{libssh2_config.h.in => libssh2_config_cmake.h.in} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename example/{libssh2_config.h.in => libssh2_config_cmake.h.in} (100%) rename tests/{libssh2_config.h.in => libssh2_config_cmake.h.in} (100%) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 07eb43a..34ea18f 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014 Alexander Lamaison +# Copyright (c) 2014, 2015 Alexander Lamaison # # Redistribution and use in source and binary forms, # with or without modification, are permitted provided @@ -97,5 +97,5 @@ check_symbol_exists(__func__ "" HAVE___FUNC__) check_symbol_exists(__FUNCTION__ "" HAVE___FUNCTION__) 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) diff --git a/example/libssh2_config.h.in b/example/libssh2_config_cmake.h.in similarity index 100% rename from example/libssh2_config.h.in rename to example/libssh2_config_cmake.h.in diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d209c21..fd0a25a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014 Alexander Lamaison +# Copyright (c) 2014, 2015 Alexander Lamaison # # Redistribution and use in source and binary forms, # 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) 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) set(TESTS diff --git a/tests/libssh2_config.h.in b/tests/libssh2_config_cmake.h.in similarity index 100% rename from tests/libssh2_config.h.in rename to tests/libssh2_config_cmake.h.in