Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
44a62b19
Commit
44a62b19
authored
Aug 10, 2017
by
Davis King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A bit of path cleanup
parent
8f3249a4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
CMakeLists.txt
dlib/java/CMakeLists.txt
+1
-1
cmake_swig_jni
dlib/java/cmake_swig_jni
+6
-3
swig_api.h
dlib/java/swig_api.h
+2
-2
No files found.
dlib/java/CMakeLists.txt
View file @
44a62b19
...
@@ -14,7 +14,7 @@ include_directories(
...
@@ -14,7 +14,7 @@ include_directories(
# Additional dependencies
# Additional dependencies
#include(../../dlib/cmake)
#include(../../dlib/cmake)
#set(additional_link_libraries dlib)
#set(additional_link_libraries dlib
::dlib
)
# Tell swig to put the output files (the shared library and .jar) into the local folder.
# Tell swig to put the output files (the shared library and .jar) into the local folder.
set
(
install_target_output_folder .
)
set
(
install_target_output_folder .
)
...
...
dlib/java/cmake_swig_jni
View file @
44a62b19
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# ### can do that by setting additional_link_libraries. Here is an example of
# ### can do that by setting additional_link_libraries. Here is an example of
# ### linking to dlib:
# ### linking to dlib:
# include(../../dlib/dlib/cmake)
# include(../../dlib/dlib/cmake)
# set(additional_link_libraries dlib)
# set(additional_link_libraries dlib
::dlib
)
#
#
# ### Tell swig to put the output files into the parent folder of your CMakeLists.txt
# ### Tell swig to put the output files into the parent folder of your CMakeLists.txt
# ### file when you run make install.
# ### file when you run make install.
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
################################################################################
################################################################################
################################################################################
################################################################################
cmake_minimum_required (VERSION 2.8.
4
)
cmake_minimum_required (VERSION 2.8.
12
)
# This block of code tries to figure out what the JAVA_HOME environment
# This block of code tries to figure out what the JAVA_HOME environment
# variable should be by looking at the folder that contains the java
# variable should be by looking at the folder that contains the java
...
@@ -108,11 +108,14 @@ if (UNIX)
...
@@ -108,11 +108,14 @@ if (UNIX)
add_global_switch(-fPIC)
add_global_switch(-fPIC)
endif()
endif()
set(dlib_root_path ${CMAKE_CURRENT_LIST_DIR}/../../)
string(REGEX REPLACE "\\." "/" package_path ${java_package_name})
string(REGEX REPLACE "\\." "/" package_path ${java_package_name})
string(REGEX REPLACE "\\..*" "" package_root_name ${java_package_name})
string(REGEX REPLACE "\\..*" "" package_root_name ${java_package_name})
set(CMAKE_SWIG_FLAGS -package ${java_package_name})
include_directories(${dlib_root_path})
set(CMAKE_SWIG_FLAGS -package ${java_package_name} -I${dlib_root_path})
set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/lib/java_src/${package_path})
set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/lib/java_src/${package_path})
set(output_library_name ${PROJECT_NAME})
set(output_library_name ${PROJECT_NAME})
...
...
dlib/java/swig_api.h
View file @
44a62b19
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
// function arguments. You do this by putting this pair of include statements in your
// function arguments. You do this by putting this pair of include statements in your
// swig_api.h file. Then after that you can use the java::array, java::array_view, and
// swig_api.h file. Then after that you can use the java::array, java::array_view, and
// java::array_view_crit classes.
// java::array_view_crit classes.
#include
"java_array.h"
#include
<dlib/java/java_array.h>
#ifdef SWIG
#ifdef SWIG
%
include
"java_array.h"
%
include
<
dlib
/
java
/
java_array
.
h
>
#endif
#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