Skip to content

Commit

Permalink
Revert "clean up generated binary name slightly to be consistent with…
Browse files Browse the repository at this point in the history
… other meta examples"

This reverts commit c3919b0.
  • Loading branch information
karlnapf authored and vigsterkr committed Mar 10, 2016
1 parent 53ad695 commit ba7f135
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions examples/meta/cpp/CMakeLists.txt
Expand Up @@ -9,8 +9,8 @@ FOREACH(META_EXAMPLE ${META_EXAMPLES})

# meta examples have to be generated before executable and test is added
SET(GENERATED_CPP ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE_REL_DIR}/${EXAMPLE_NAME}.cpp)
SET(GENERATED_CPP_TARGET ${EXAMPLE_REL_DIR}/${EXAMPLE_NAME})
SET(GENERATED_CPP_TEST ${EXAMPLE_REL_DIR}/${EXAMPLE_NAME})
SET(GENERATED_CPP_TARGET generated_cpp-${EXAMPLE_NAME_WITH_DIR})
SET(GENERATED_CPP_TEST generated_cpp-${EXAMPLE_NAME_WITH_DIR})

ADD_EXECUTABLE(${GENERATED_CPP_TARGET} ${GENERATED_CPP})
ADD_DEPENDENCIES(${GENERATED_CPP_TARGET} meta_examples shogun)
Expand All @@ -20,7 +20,7 @@ FOREACH(META_EXAMPLE ${META_EXAMPLES})
LIST(APPEND CPP_EXAMPLES ${GENERATED_CPP_TARGET})

# run test in source dir, to have access to "data" folder
ADD_TEST(NAME generated_cpp-${EXAMPLE_NAME_WITH_DIR}
ADD_TEST(NAME ${GENERATED_CPP_TEST}
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_CPP_TARGET}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
LIST(APPEND INSTALL_EXAMPLES ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_CPP_TARGET})
Expand Down

0 comments on commit ba7f135

Please sign in to comment.