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.

Sign up for GitHub

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

Jump to bottom

update fineobj to 15 47 #1013

Merged
merged 11 commits into from
Dec 25, 2023
Merged

update fineobj to 15 47 #1013

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
28df409
update fineobj to 15 47
Dec 22, 2023
934565f
Upgrade NeoMLTest
Dec 22, 2023
a7554b7
Call set_global_variables before include(FineInstall)
Dec 22, 2023
b8ec992
Remove unused variable
Dec 22, 2023
c495704
Fix protobuf compilation errors on Darwin
Dec 22, 2023
4f13ac8
Remove invalid unicode symbols from copyright (+update)
Dec 22, 2023
ae977fa
Merge branch 'master' into fobj47
Dec 22, 2023
a81624e
Remove unused variable
Dec 22, 2023
7c16c08
Update NeoMLTest version
Dec 23, 2023
159823c
Switch to next NeoMLTest
Dec 23, 2023
dfce57e
Update NeoMLTest
Dec 25, 2023
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
Prev Previous commit
Next Next commit
Call set_global_variables before include(FineInstall) 
Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com>
  • Loading branch information
Valery Fedyunin committed Dec 22, 2023
commit a7554b70ae185c88c66365de06d4cd44fa97b1c6
6 changes: 3 additions & 3 deletions NeoML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ endif()

include(Settings)
include(Version)
# Set cmake default variables and some usefull variables
set_global_variables()

if(USE_FINE_OBJECTS)
include(FineInstall)
else()
Expand Down Expand Up @@ -57,9 +60,6 @@ if(NOT (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES
set(NeoOnnx_BUILD OFF CACHE BOOL "" FORCE)
endif()

# Set cmake default variables and some usefull variables
set_global_variables()

if(USE_FINE_OBJECTS)
find_package(FineObjects)
if(NOT FineObj_FOUND)
Expand Down
Loading