Commit e93ad40 1 parent 7e9e438 commit e93ad40 Copy full SHA for e93ad40
File tree 7 files changed +1344
-5
lines changed
7 files changed +1344
-5
lines changed Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change @@ -11,6 +11,11 @@ if(NOT DEFINED CMAKE_INSTALL_PREFIX)
11
11
endif ()
12
12
message (STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX} " )
13
13
14
+ if (NOT DEFINED NCNN_VERSION_STRING)
15
+ string (TIMESTAMP NCNN_VERSION_STRING "build-%Y%m%d" )
16
+ endif ()
17
+ message (STATUS "NCNN_VERSION_STRING = ${NCNN_VERSION_STRING} " )
18
+
14
19
cmake_minimum_required (VERSION 2.8.12)
15
20
16
21
if (NOT CMAKE_BUILD_TYPE )
Original file line number Diff line number Diff line change 3
3
<plist version =" 1.0" >
4
4
<dict >
5
5
<key >CFBundleName </key >
6
- <string >ncnn </string >
6
+ <string >__NAME__ </string >
7
7
<key >CFBundleIdentifier </key >
8
- <string >com.tencent.ncnn </string >
8
+ <string >__IDENTIFIER__ </string >
9
9
<key >CFBundleVersion </key >
10
- <string >1.0 </string >
10
+ <string >__VERSION__ </string >
11
11
<key >CFBundleShortVersionString </key >
12
- <string >1.0 </string >
12
+ <string >__VERSION__ </string >
13
13
<key >CFBundleSignature </key >
14
14
<string >???? </string >
15
15
<key >CFBundlePackageType </key >
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ if(NCNN_VULKAN)
12
12
if (NCNN_SYSTEM_GLSLANG)
13
13
set (GLSLANG_TARGET_DIR "@GLSLANG_TARGET_DIR@" )
14
14
else ()
15
- set (GLSLANG_TARGET_DIR "${CMAKE_CURRENT_LIST_DIR} /.." )
15
+ set (GLSLANG_TARGET_DIR "${CMAKE_CURRENT_LIST_DIR} /../../../@CMAKE_INSTALL_LIBDIR@/cmake " )
16
16
endif (NCNN_SYSTEM_GLSLANG)
17
17
18
18
find_package (Threads)
Original file line number Diff line number Diff line change @@ -30,6 +30,11 @@ using ncnn::Option;
30
30
extern " C" {
31
31
#endif
32
32
33
+ const char * ncnn_version ()
34
+ {
35
+ return NCNN_VERSION_STRING;
36
+ }
37
+
33
38
/* mat api */
34
39
ncnn_mat_t ncnn_mat_create ()
35
40
{
Original file line number Diff line number Diff line change 23
23
extern "C" {
24
24
#endif
25
25
26
+ const char * ncnn_version ();
27
+
26
28
/* mat api */
27
29
typedef struct __ncnn_mat_t * ncnn_mat_t ;
28
30
Original file line number Diff line number Diff line change 31
31
#cmakedefine01 NCNN_AVX2
32
32
#cmakedefine01 NCNN_ARM82
33
33
34
+ #cmakedefine NCNN_VERSION_STRING "@NCNN_VERSION_STRING@"
35
+
34
36
#ifdef __cplusplus
35
37
36
38
#if NCNN_THREADS
You can’t perform that action at this time.
0 commit comments