Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
26524fe7
Commit
26524fe7
authored
Jul 05, 2017
by
Davis King
Browse files
Renamed a few things to make the code and messages clearer.
parent
5089196e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+2
-2
dlib/cmake_utils/check_if_neon_available.cmake
dlib/cmake_utils/check_if_neon_available.cmake
+4
-6
No files found.
dlib/CMakeLists.txt
View file @
26524fe7
...
...
@@ -387,8 +387,8 @@ if (NOT TARGET dlib)
)
include
(
cmake_utils/check_if_neon_available.cmake
)
if
(
NEON OR COMPILER_ON_ARM_NEON
)
message
(
"NEON
will be used for libpng."
)
if
(
ARM_NEON_IS_AVAILABLE
)
message
(
STATUS
"NEON instructions
will be used for libpng."
)
enable_language
(
ASM
)
set
(
source_files
${
source_files
}
external/libpng/arm/arm_init.c
...
...
dlib/cmake_utils/check_if_neon_available.cmake
View file @
26524fe7
...
...
@@ -3,20 +3,18 @@
cmake_minimum_required
(
VERSION 2.8.12
)
# Don't rerun this script if its already been executed.
if
(
DEFINED
COMPILER_ON_ARM_NEON
)
if
(
DEFINED
ARM_NEON_IS_AVAILABLE
)
return
()
endif
()
# Set to false unless we find out otherwise in the code below.
set
(
COMPILER_ON_ARM_NEON
0
)
set
(
ARM_NEON_IS_AVAILABLE
0
)
# test if __ARM_NEON__ is defined
try_compile
(
test_for_neon_worked
${
PROJECT_BINARY_DIR
}
/neon_test_build
${
CMAKE_CURRENT_LIST_DIR
}
/test_for_neon
neon_test
)
message
(
"ARM NEON TEST OK:
${
test_for_neon_worked
}
"
)
if
(
test_for_neon_worked
)
message
(
"__ARM_NEON__ defined."
)
set
(
COMPILER_ON_ARM_NEON
1
)
message
(
STATUS
"__ARM_NEON__ defined."
)
set
(
ARM_NEON_IS_AVAILABLE
1
)
endif
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment