From 4ab065bb88ffe1309b8317bcb1c6833255f9eef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Thu, 20 Sep 2012 20:23:09 -0400 Subject: [PATCH] third-party: fix gitignore --- third-party/.gitignore | 4 +++- third-party/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/third-party/.gitignore b/third-party/.gitignore index 453af308c..efc4279f7 100644 --- a/third-party/.gitignore +++ b/third-party/.gitignore @@ -1,2 +1,4 @@ -**/** +* +**/* +!CMakeLists.txt diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 5a27d8337..07bc7f806 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -22,9 +22,9 @@ file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") foreach(dir ${all_valid_subdirs}) - message(STATUS "path = ${dir}") if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) + message(STATUS "Adding third-party component ${dir_trimmed}") add_subdirectory(${dir_trimmed}) endif() endforeach(dir)