Commit de14e908 authored by Robert Maynard's avatar Robert Maynard
Browse files

Stop the SMTK header test from leaking include directories.

parent a5d9afc9
......@@ -32,16 +32,18 @@ function(smtk_add_header_test name dir_prefix)
set(cxxfiles ${cxxfiles} ${src})
endforeach (header)
# message(STATUS "sysTools_BINARY_DIR='${sysTools_BINARY_DIR}'")
# include_directories(${sysTools_BINARY_DIR})
#include the build directory for the export header
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(TestBuild_${name} ${cxxfiles} ${hfiles})
# target_link_libraries(TestBuild_${name} sysTools)
set_source_files_properties(${hfiles}
PROPERTIES HEADER_FILE_ONLY TRUE
)
#include the build directory for the export header
target_include_directories(TestBuild_${name}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
)
endfunction(smtk_add_header_test)
# Declare a list of header files. Will make sure the header files get
......
################################################################################
################################################################################
# Make a library of some utility functions for tests to use:
################################################################################
add_library(smtkCoreModelTesting STATIC helpers.cxx)
......@@ -30,6 +30,7 @@ add_test(unitTessellation ${EXECUTABLE_OUTPUT_PATH}/unitTessellation)
add_executable(unitOperator unitOperator.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitOutcomeOperator.sbt" unitOperatorXML)
target_include_directories(unitOperator PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
target_link_libraries(unitOperator smtkCore smtkCoreModelTesting)
if (SMTK_ENABLE_CGM_SESSION)
target_link_libraries(unitOperator smtkCGMSession)
......@@ -42,6 +43,7 @@ add_test(unitEntityRef ${EXECUTABLE_OUTPUT_PATH}/unitEntityRef)
add_executable(unitDefaultSession unitDefaultSession.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitForwardingOperator.sbt" unitOperatorXML)
target_include_directories(unitDefaultSession PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
target_link_libraries(unitDefaultSession smtkCore smtkCoreModelTesting)
add_test(unitDefaultSession ${EXECUTABLE_OUTPUT_PATH}/unitDefaultSession)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment