ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more portability changes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-10-21 14:22:06 -04:00
parent d7a0971578
commit 9cdf6f1e8b
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/swig/CMakeLists.txt
View File

@ -45,7 +45,7 @@ if(BUILD_SWIG_JAVA)
find_package(JNI REQUIRED) find_package(JNI REQUIRED)
target_include_directories(javalammps PRIVATE ${JNI_INCLUDE_DIRS}) target_include_directories(javalammps PRIVATE ${JNI_INCLUDE_DIRS})
swig_link_libraries(javalammps PRIVATE lammps ${JNI_LIBRARIES}) swig_link_libraries(javalammps PRIVATE lammps ${JNI_LIBRARIES})
configure_file(run_java_example.sh run_java_example.sh COPYONLY) configure_file(run_java_example.sh.in run_java_example.sh @ONLY)
endif() endif()
if(BUILD_SWIG_LUA) if(BUILD_SWIG_LUA)
@ -54,17 +54,18 @@ if(BUILD_SWIG_LUA)
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
target_include_directories(lualammps PRIVATE ${LUA_INCLUDE_PATH}) target_include_directories(lualammps PRIVATE ${LUA_INCLUDE_PATH})
swig_link_libraries(lualammps PRIVATE lammps ${LUA_LIBRARY}) swig_link_libraries(lualammps PRIVATE lammps ${LUA_LIBRARY})
configure_file(run_lua_example.sh run_lua_example.sh COPYONLY) configure_file(run_lua_example.sh.in run_lua_example.sh @ONLY)
endif() endif()
if(BUILD_SWIG_PERL5) if(BUILD_SWIG_PERL5)
set_property(SOURCE lammps.i PROPERTY SWIG_MODULE_NAME pllammps) set_property(SOURCE lammps.i PROPERTY SWIG_MODULE_NAME pllammps)
swig_add_library(pllammps TYPE MODULE LANGUAGE perl5 SOURCES lammps.i) swig_add_library(pllammps TYPE MODULE LANGUAGE perl5 SOURCES lammps.i)
find_package(Perl)
find_package(PerlLibs REQUIRED 5.0) find_package(PerlLibs REQUIRED 5.0)
target_compile_definitions(pllammps PRIVATE _LARGEFILE64_SOURCE) target_compile_definitions(pllammps PRIVATE _LARGEFILE64_SOURCE)
target_include_directories(pllammps PRIVATE ${PERL_INCLUDE_PATH}) target_include_directories(pllammps PRIVATE ${PERL_INCLUDE_PATH})
swig_link_libraries(pllammps PRIVATE lammps ${PERL_LIBRARY}) swig_link_libraries(pllammps PRIVATE lammps ${PERL_LIBRARY})
configure_file(run_perl_example.sh run_perl_example.sh COPYONLY) configure_file(run_perl_example.sh.in run_perl_example.sh @ONLY)
endif() endif()
if(BUILD_SWIG_PYTHON) if(BUILD_SWIG_PYTHON)
@ -81,15 +82,17 @@ if(BUILD_SWIG_RUBY)
find_package(Ruby REQUIRED) find_package(Ruby REQUIRED)
target_include_directories(rubylammps PRIVATE ${RUBY_INCLUDE_DIRS}) target_include_directories(rubylammps PRIVATE ${RUBY_INCLUDE_DIRS})
swig_link_libraries(rubylammps PRIVATE lammps ${RUBY_LIBRARY}) swig_link_libraries(rubylammps PRIVATE lammps ${RUBY_LIBRARY})
configure_file(run_ruby_example.sh run_ruby_example.sh COPYONLY) configure_file(run_ruby_example.sh.in run_ruby_example.sh @ONLY)
endif() endif()
if(BUILD_SWIG_TCL) if(BUILD_SWIG_TCL)
# build loadable Tcl module
set_property(SOURCE lammps.i PROPERTY SWIG_MODULE_NAME tcllammps) set_property(SOURCE lammps.i PROPERTY SWIG_MODULE_NAME tcllammps)
swig_add_library(tcllammps TYPE MODULE LANGUAGE tcl SOURCES lammps.i) swig_add_library(tcllammps TYPE MODULE LANGUAGE tcl SOURCES lammps.i)
find_package(TCL REQUIRED) find_package(TCL REQUIRED)
target_include_directories(tcllammps PRIVATE ${TCL_INCLUDE_PATH}) target_include_directories(tcllammps PRIVATE ${TCL_INCLUDE_PATH})
swig_link_libraries(tcllammps PRIVATE lammps ${TCL_LIBRARY}) swig_link_libraries(tcllammps PRIVATE lammps ${TCL_LIBRARY})
# build extended Tcl shell binary
set_property(SOURCE lammps_shell.i PROPERTY SWIG_MODULE_NAME tcllmpsh) set_property(SOURCE lammps_shell.i PROPERTY SWIG_MODULE_NAME tcllmpsh)
swig_add_library(libtcllmpsh TYPE STATIC LANGUAGE tcl SOURCES lammps_shell.i) swig_add_library(libtcllmpsh TYPE STATIC LANGUAGE tcl SOURCES lammps_shell.i)
add_executable(tcllmpsh tcldummy.c) add_executable(tcllmpsh tcldummy.c)

4
tools/swig/run_java_example.sh → tools/swig/run_java_example.sh.in
View File

@ -59,5 +59,5 @@ LD_LIBRARY_PATH=${PWD}:${LD_LIBARARY_PATH-${PWD}}
export CLASSPATH LD_LIBRARY_PATH export CLASSPATH LD_LIBRARY_PATH
javac *.java @Java_JAVAC_EXECUTABLE@ *.java
java example @Java_JAVA_EXECUTABLE@ example

0
tools/swig/run_lua_example.sh → tools/swig/run_lua_example.sh.in
View File

2
tools/swig/run_perl_example.sh → tools/swig/run_perl_example.sh.in
View File

@ -63,4 +63,4 @@ PERL5LIB=${PWD}:${PERL5LIB-${PWD}}
export PERL5LIB export PERL5LIB
perl example.pl @PERL_EXECUTABLE@ example.pl

0
tools/swig/run_ruby_example.sh → tools/swig/run_ruby_example.sh.in
View File