From 1890320b173863fbf1e16a9d9d5f7b07cf6afc49 Mon Sep 17 00:00:00 2001 From: Marcel Loose <loose@astron.nl> Date: Fri, 11 Sep 2009 13:50:49 +0000 Subject: [PATCH] Bug 1310: Stripped redundant codein CMakeLists.txt files for script-only projects in LCU --- LCU/CMakeLists.txt | 9 +-------- LCU/Firmware/CMakeLists.txt | 8 +------- LCU/Firmware/tools/CMakeLists.txt | 11 +---------- LCU/StationTest/CMakeLists.txt | 10 ++-------- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/LCU/CMakeLists.txt b/LCU/CMakeLists.txt index 376e2396a53..212704911f4 100644 --- a/LCU/CMakeLists.txt +++ b/LCU/CMakeLists.txt @@ -28,17 +28,10 @@ include(LofarInit) ## --------------------------------------------------------------------------- ## Project characteristics ## --------------------------------------------------------------------------- -project(LCU) -include(LofarGeneral) +project(LCU NONE) ## --------------------------------------------------------------------------- ## Subdirectories ## --------------------------------------------------------------------------- lofar_add_subdirectory(Firmware) lofar_add_subdirectory(StationTest) - -## --------------------------------------------------------------------------- -## Generate configuration header file. -## --------------------------------------------------------------------------- -include(LofarConfig) - diff --git a/LCU/Firmware/CMakeLists.txt b/LCU/Firmware/CMakeLists.txt index 184ff32fd96..c15c58f9275 100644 --- a/LCU/Firmware/CMakeLists.txt +++ b/LCU/Firmware/CMakeLists.txt @@ -28,15 +28,9 @@ include(LofarInit) ## --------------------------------------------------------------------------- ## Project characteristics ## --------------------------------------------------------------------------- -project(Firmware) -include(LofarGeneral) +project(Firmware NONE) ## --------------------------------------------------------------------------- ## Subdirectories ## --------------------------------------------------------------------------- lofar_add_subdirectory(tools) - -## --------------------------------------------------------------------------- -## Generate configuration header file. -## --------------------------------------------------------------------------- -include(LofarConfig) diff --git a/LCU/Firmware/tools/CMakeLists.txt b/LCU/Firmware/tools/CMakeLists.txt index 27b7332a563..467309ab52e 100644 --- a/LCU/Firmware/tools/CMakeLists.txt +++ b/LCU/Firmware/tools/CMakeLists.txt @@ -28,16 +28,7 @@ include(LofarInit) ## --------------------------------------------------------------------------- ## Project characteristics ## --------------------------------------------------------------------------- -project(Firmware-Tools) -include(LofarGeneral) - -include(LofarAddPackage) -lofar_add_package(${PROJECT_NAME} 1.0) - -## --------------------------------------------------------------------------- -## Generate configuration header file. -## --------------------------------------------------------------------------- -include(LofarConfig) +project(Firmware-Tools NONE) ## --------------------------------------------------------------------------- ## Subdirectories diff --git a/LCU/StationTest/CMakeLists.txt b/LCU/StationTest/CMakeLists.txt index 970b33ecad1..a430af2efe3 100644 --- a/LCU/StationTest/CMakeLists.txt +++ b/LCU/StationTest/CMakeLists.txt @@ -28,16 +28,10 @@ include(LofarInit) ## --------------------------------------------------------------------------- ## Project characteristics ## --------------------------------------------------------------------------- -project(StationTest) -include(LofarGeneral) +project(StationTest NONE) ## --------------------------------------------------------------------------- -## Generate configuration header file. -## --------------------------------------------------------------------------- -include(LofarConfig) - -## --------------------------------------------------------------------------- -## Installation +## Install files matching regex pattern in current directory and below ## --------------------------------------------------------------------------- install(DIRECTORY . DESTINATION stationtest -- GitLab