From 820f45b10be04df10f110a1afdfef134b8d38fcc Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Fri, 29 May 2009 22:48:25 +0000 Subject: [PATCH] Patch to simplify CMakeLists.txt files --- CMakeLists.txt | 71 +++++--------------------------------- yaml-reader/CMakeLists.txt | 6 ++-- 2 files changed, 11 insertions(+), 66 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 287677d..2c7d226 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,73 +1,18 @@ cmake_minimum_required(VERSION 2.6) project (YAML_CPP) -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) +set(LIBRARY_OUTPUT_PATH ${YAML_CPP_SOURCE_DIR}/lib) -set(PUB_HDR - include/conversion.h - include/crt.h - include/emitter.h - include/emittermanip.h - include/exceptions.h - include/iterator.h - include/node.h - include/noncopyable.h - include/ostream.h - include/parser.h - include/parserstate.h - include/stlemitter.h - include/yaml.h -) - -set(PVT_HDR - src/alias.h - src/content.h - src/emitterstate.h - src/emitterutils.h - src/exp.h - src/indentation.h - src/iterpriv.h - src/ltnode.h - src/map.h - src/regex.h - src/scalar.h - src/scanner.h - src/scanscalar.h - src/sequence.h - src/setting.h - src/stream.h - src/token.h -) - -set(SRC - src/alias.cpp - src/content.cpp - src/conversion.cpp - src/emitter.cpp - src/emitterstate.cpp - src/emitterutils.cpp - src/exp.cpp - src/iterator.cpp - src/map.cpp - src/node.cpp - src/ostream.cpp - src/parser.cpp - src/parserstate.cpp - src/regex.cpp - src/scalar.cpp - src/scanner.cpp - src/scanscalar.cpp - src/scantoken.cpp - src/sequence.cpp - src/simplekey.cpp - src/stream.cpp -) +file(GLOB public_headers include/*.h) +file(GLOB private_headers src/*.h) +file(GLOB sources src/*.cpp) include_directories(${YAML_CPP_SOURCE_DIR}/include) add_library(yaml-cpp - ${PUB_HDR} - ${PVT_HDR} - ${SRC} + ${public_headers} + ${private_headers} + ${sources} ) add_subdirectory (yaml-reader) + diff --git a/yaml-reader/CMakeLists.txt b/yaml-reader/CMakeLists.txt index 7e3f6b3..082a38a 100644 --- a/yaml-reader/CMakeLists.txt +++ b/yaml-reader/CMakeLists.txt @@ -1,6 +1,6 @@ -set(FILES main.cpp tests.cpp) +set(yaml-reader_sources main.cpp tests.cpp) include_directories(${YAML_CPP_SOURCE_DIR}/include) -link_directories(${YAML_CPP_BINARY_DIR}/bin) +link_directories(${YAML_CPP_SOURCE_DIR}/lib) -add_executable(yaml-reader ${FILES}) +add_executable(yaml-reader ${yaml-reader_sources}) target_link_libraries(yaml-reader yaml-cpp)