Skip to content

Commit

Permalink
reorder PROJECT_BINARY_DIR and PROJECT_SOURCE_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
wgtmac committed Jan 13, 2025
1 parent 6b466cb commit aff49b1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions c++/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@ target_include_directories (orc
INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/c++/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++/include>
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${LIBHDFSPP_INCLUDE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion c++/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_FLAGS} ${WARN_FLAGS}")

add_library (orc-test-include INTERFACE)
target_include_directories (orc-test-include INTERFACE
${PROJECT_SOURCE_DIR}/c++/src
${PROJECT_BINARY_DIR}/c++/include
${PROJECT_BINARY_DIR}/c++/src
${PROJECT_SOURCE_DIR}/c++/src
)

if(BUILD_ENABLE_AVX512)
Expand Down
4 changes: 2 additions & 2 deletions tools/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX17_FLAGS} ${WARN_FLAGS}")

add_library (orc-tools-common INTERFACE)
target_include_directories (orc-tools-common INTERFACE
${PROJECT_SOURCE_DIR}/c++/include
${PROJECT_BINARY_DIR}/c++/include
${PROJECT_SOURCE_DIR}/c++/src
${PROJECT_BINARY_DIR}/c++/src
${PROJECT_SOURCE_DIR}/c++/include
${PROJECT_SOURCE_DIR}/c++/src
)
target_link_libraries (orc-tools-common INTERFACE
orc
Expand Down
4 changes: 2 additions & 2 deletions tools/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ target_link_libraries (tool-test
)

target_include_directories(tool-test PRIVATE
${PROJECT_BINARY_DIR}/c++/include
${PROJECT_BINARY_DIR}/c++/src
${PROJECT_SOURCE_DIR}/c++/include
${PROJECT_SOURCE_DIR}/c++/src
${PROJECT_SOURCE_DIR}/tools-c++/src
${PROJECT_BINARY_DIR}/c++/include
${PROJECT_BINARY_DIR}/c++/src
)

add_dependencies(tool-test tool-set)
Expand Down

0 comments on commit aff49b1

Please sign in to comment.