Skip to content

Commit d7873e1

Browse files
authored
remove patchelf in windows (#12710)
* remove patchelf in windowls * "follow comment"
1 parent 17da113 commit d7873e1

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ python/paddle/v2/fluid/tests/book/image_classification_resnet.inference.model/
55
python/paddle/v2/fluid/tests/book/image_classification_vgg.inference.model/
66
python/paddle/v2/fluid/tests/book/label_semantic_roles.inference.model/
77
*.DS_Store
8+
*.vs
89
build/
910
build_doc/
1011
*.user
@@ -15,6 +16,7 @@ build_doc/
1516
.cproject
1617
.pydevproject
1718
.settings/
19+
CMakeSettings.json
1820
Makefile
1921
.test_env/
2022
third_party/

cmake/configure.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ if(NOT CMAKE_CROSSCOMPILING)
5656
set(SIMD_FLAG ${SSE3_FLAG})
5757
endif()
5858
endif()
59+
if(UNIX AND NOT APPLE)
60+
# except apple from nix*Os family
61+
set(LINUX TRUE)
62+
endif(UNIX AND NOT APPLE)
5963

6064
if(NOT WITH_GOLANG)
6165
add_definitions(-DPADDLE_WITHOUT_GOLANG)

python/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@ if(APPLE)
9797
if(NOT INSTALL_NAME_TOOL_EXECUTABLE)
9898
message(FATAL_ERROR "install_name_tool not found, please check.\n")
9999
endif()
100-
else(APPLE)
100+
endif()
101+
if(LINUX)
101102
find_program(PATCHELF_EXECUTABLE patchelf)
102103
if(NOT PATCHELF_EXECUTABLE)
103104
message(FATAL_ERROR "patchelf not found, please install it.\n"
104105
"For Ubuntu, the command is: apt-get install -y patchelf.")
105106
endif()
106-
endif(APPLE)
107+
endif(LINUX)

0 commit comments

Comments
 (0)