From 6c296a9524151e4be9f464a50ad9763fb28b923e Mon Sep 17 00:00:00 2001 From: Jannik ZANDER Date: Fri, 10 Feb 2017 20:26:41 +0100 Subject: [PATCH] Make cmake folder --- CMakeLists.txt | 2 +- AddUnitTest.cmake => cmake/AddUnitTest.cmake | 2 +- CMakeLists.txt.in => cmake/CMakeLists.txt.in | 0 folder1/Source/folder1.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename AddUnitTest.cmake => cmake/AddUnitTest.cmake (94%) rename CMakeLists.txt.in => cmake/CMakeLists.txt.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c15cd8a..54f91b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.2) project(solution_test) -include(AddUnitTest.cmake) +include(cmake/AddUnitTest.cmake) # Add folder1 add_subdirectory(folder1/Source) diff --git a/AddUnitTest.cmake b/cmake/AddUnitTest.cmake similarity index 94% rename from AddUnitTest.cmake rename to cmake/AddUnitTest.cmake index 05f52ff..722109e 100644 --- a/AddUnitTest.cmake +++ b/cmake/AddUnitTest.cmake @@ -93,7 +93,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif() # Download and unpack googletest at configure time -configure_file("CMakeLists.txt.in" googletest-download/CMakeLists.txt) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeLists.txt.in" googletest-download/CMakeLists.txt) execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . RESULT_VARIABLE result WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) diff --git a/CMakeLists.txt.in b/cmake/CMakeLists.txt.in similarity index 100% rename from CMakeLists.txt.in rename to cmake/CMakeLists.txt.in diff --git a/folder1/Source/folder1.c b/folder1/Source/folder1.c index 36066c0..6064ddc 100644 --- a/folder1/Source/folder1.c +++ b/folder1/Source/folder1.c @@ -8,4 +8,4 @@ int function1() int function2() { return 2; -} \ No newline at end of file +} -- 2.43.0