From 7164692e1f8c77008ba64edccbca7012a65ac9a6 Mon Sep 17 00:00:00 2001 From: Nicholas O'Connor Date: Thu, 23 Mar 2017 01:03:56 -0700 Subject: [PATCH] forgot to include cmakelists changes --- CMakeLists.txt | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 105500a..9564c0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,29 +1,34 @@ cmake_minimum_required(VERSION 3.7.2) -project(cellar) +project(cellar CXX) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(PythonInterp) +find_package(Boost 1.63 REQUIRED COMPONENTS filesystem) include_directories(include) +set(src "${CMAKE_CURRENT_SOURCE_DIR}/src") set(coggedfiles) -file(GLOB cogfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" +file(GLOB_RECURSE cogfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.cog") foreach(cogfile ${cogfiles}) - string(REGEX REPLACE ".in\$" "" outfile "${cogfile}") + string(REGEX REPLACE ".cog\$" "" outfile "${cogfile}") set(thisfile "${CMAKE_CURRENT_SOURCE_DIR}/${outfile}") - add_custom_command(OUTPUT "${outfile}" + add_custom_command(OUTPUT "${thisfile}" COMMAND ${PYTHON_EXECUTABLE} -m cogapp -d -o "${outfile}" "${cogfile}" DEPENDS ${cogfile} - COMMENT "Greasing the cog for ${outfile}") + COMMENT "Greasing the cog for ${thisfile}") - set(coggedfiles ${coggedfiles} ${thisfile}) + set(coggedfiles ${coggedfiles} "${thisfile}") endforeach(cogfile) -add_custom_target(cog ALL DEPENDS ${cogfiles}) +add_custom_target(cog ALL DEPENDS ${coggedfiles}) -add_executable(cellar src/cellar.cpp src/commands.cpp src/fs.cpp - src/bottles.cpp src/version.cpp) +add_executable(cellar ${src}/cellar.cpp ${src}/commands.cpp ${src}/fs.cpp + ${src}/bottles.cpp ${src}/version.cpp) add_dependencies(cellar cog) +target_link_libraries(cellar ${Boost_LIBRARIES})