This is an automated email from the ASF dual-hosted git repository.
gangwu pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new acdd6007b ORC-1733: [C++][CMake] Fix CMAKE_MODULE_PATH not to use
PROJECT_SOURCE_DIR
acdd6007b is described below
commit acdd6007b2d96bec1e1bd68da121787e7990e139
Author: Gang Wu <[email protected]>
AuthorDate: Tue Jun 25 23:49:23 2024 +0800
ORC-1733: [C++][CMake] Fix CMAKE_MODULE_PATH not to use PROJECT_SOURCE_DIR
Change `PROJECT_SOURCE_DIR` to `CMAKE_CURRENT_SOURCE_DIR` for
`CMAKE_MODULE_PATH`.
Line below is not portable when ORC is used by downstream projects:
```
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/cmake_modules")
```
Make sure all CIs pass.
No.
Closes #1959 from wgtmac/ORC-1733.
Authored-by: Gang Wu <[email protected]>
Signed-off-by: Gang Wu <[email protected]>
(cherry picked from commit 2609934f9f45dedf38260670fea0f6454b10aec8)
Signed-off-by: Gang Wu <[email protected]>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 290448d67..8e44bc7cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
SET(CPACK_PACKAGE_VERSION_PATCH "2-SNAPSHOT")
SET(ORC_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${PROJECT_SOURCE_DIR}/cmake_modules")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
option (BUILD_JAVA
"Include ORC Java library in the build process"