Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cpuinfo branch #214

Merged
merged 2 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ENDMACRO()
MACRO(NNPACK_TARGET_ENABLE_CXX11 target)
IF(${CMAKE_VERSION} VERSION_LESS "3.1")
IF(NOT MSVC)
TARGET_COMPILE_OPTIONS(${target} PRIVATE -std=gnu++11)
TARGET_COMPILE_OPTIONS(${target} PRIVATE -std=gnu++11 -fPIC)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unrelated, please revert

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have fixed it.

ENDIF()
ELSE()
SET_TARGET_PROPERTIES(${target} PROPERTIES
Expand Down
2 changes: 1 addition & 1 deletion cmake/DownloadCpuinfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROJECT(cpuinfo-download NONE)
INCLUDE(ExternalProject)
ExternalProject_Add(cpuinfo
GIT_REPOSITORY https://github.com/Maratyszcza/cpuinfo.git
GIT_TAG master
GIT_TAG main
SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo"
BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo"
CONFIGURE_COMMAND ""
Expand Down