Skip to content

Commit

Permalink
ENH: Include top level binary dir, it contains config.h
Browse files Browse the repository at this point in the history
  • Loading branch information
aylward committed Mar 11, 2020
1 parent ac4b205 commit 6aaa614
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,6 @@ set( TubeTKLib_INCLUDE_DIRS
$<INSTALL_INTERFACE:include/TubeTKLib/Registration>
$<INSTALL_INTERFACE:include/TubeTKLib/Segmentation> )

#set( TubeTKLib_LIBRARY_DIRS
#${TubeTK_BINARY_DIR}/bin
#${TubeTK_BINARY_DIR}/lib )

####
# TubeTK includes TubeTKLib's libraries and include directories
####
Expand All @@ -277,18 +273,11 @@ set( TubeTK_INCLUDE_DIRS
$<INSTALL_INTERFACE:include>
${TubeTKLib_INCLUDE_DIRS} )

#set( TubeTK_LIBRARY_DIRS
#${TubeTK_BINARY_DIR}/bin
#${TubeTK_BINARY_DIR}/lib
#${TubeTK_EXECUTABLE_DIRS} )

set( TubeTK_SYSTEM_INCLUDE_DIRS ${TubeTK_INCLUDE_DIRS} )
#set( TubeTK_SYSTEM_LIBRARY_DIRS ${TubeTK_LIBRARY_DIRS} )

####
# Build base library and optional components
####
include_directories(
set( TubeTK_SYSTEM_INCLUDE_DIRS
${TubeTK_BINARY_DIR}
${TubeTK_SOURCE_DIR}/TubeTKLib
${TubeTK_SOURCE_DIR}/TubeTKLib/Common
${TubeTK_SOURCE_DIR}/TubeTKLib/Filtering
Expand All @@ -299,6 +288,8 @@ include_directories(
${TubeTK_SOURCE_DIR}/TubeTKLib/Registration
${TubeTK_SOURCE_DIR}/TubeTKLib/Segmentation )

include_directories( ${TubeTK_SYSTEM_INCLUDE_DIRS} )

add_subdirectory( TubeTKLib )

install( TARGETS ${TubeTKLib_LIBRARIES} EXPORT TubeTKLib-targets
Expand All @@ -307,7 +298,7 @@ install( TARGETS ${TubeTKLib_LIBRARIES} EXPORT TubeTKLib-targets
install( EXPORT TubeTKLib-targets DESTINATION lib/cmake )

####
# Build ITK module
# Build TubeTK module
####
if( NOT ITK_SOURCE_DIR )
list( APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR} )
Expand Down

0 comments on commit 6aaa614

Please sign in to comment.