From 533a20bdc3275a1cd295c8853f028e05c6949339 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sun, 5 Mar 2017 22:59:55 -0500 Subject: [PATCH] fix samples cmake lists --- benchmarks/CMakeLists.txt | 2 +- samples/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 1fd479a4..b361af9d 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(NOT COMBINED_PROJECT) - add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../source ${CMAKE_CURRENT_BINARY_DIR}/source) endif() include_directories(${LIBRARY_INCLUDE_DIR}) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index f9f7cfd5..1b5303b5 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -5,18 +5,16 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(NOT COMBINED_PROJECT) - add_subdirectory(${LIBRARY_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/source) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../source ${CMAKE_CURRENT_BINARY_DIR}/source) endif() -include_directories(${LIBRARY_INCLUDE_DIR}) - file(GLOB SAMPLE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) foreach(SAMPLE_SOURCE IN ITEMS ${SAMPLE_SOURCES}) get_filename_component(SAMPLE_NAME ${SAMPLE_SOURCE} NAME_WE) set(SAMPLE_EXECUTABLE sample-${SAMPLE_NAME}) add_executable(${SAMPLE_EXECUTABLE} ${SAMPLE_SOURCE}) - target_link_libraries(${SAMPLE_EXECUTABLE} ${LIBRARY_NAME}) + target_link_libraries(${SAMPLE_EXECUTABLE} xlnt) endforeach() file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data