Skip to content

Commit df6b177

Browse files
MizuxMizux
committed
python: fix testing
1 parent 35f5cab commit df6b177

File tree

8 files changed

+37
-34
lines changed

8 files changed

+37
-34
lines changed

‎Bar/python/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ pybind11_add_module(pyBar MODULE pyBar.cpp)
33
if(APPLE)
44
set_target_properties(pyBar PROPERTIES
55
SUFFIX ".so"
6-
INSTALL_RPATH "@loader_path;@loader_path/../../${PYTHON_PROJECT}/.libs"
6+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
77
)
88
set_property(TARGET pyBar APPEND PROPERTY
99
LINK_FLAGS "-flat_namespace -undefined suppress"
1010
)
1111
elseif(UNIX)
1212
set_target_properties(pyBar PROPERTIES
13-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../${PYTHON_PROJECT}/.libs"
13+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
1414
)
1515
endif()
1616
target_link_libraries(pyBar PRIVATE ${PROJECT_NAMESPACE}::Bar)

‎Foo/python/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ pybind11_add_module(pyFoo MODULE pyFoo.cpp)
33
if(APPLE)
44
set_target_properties(pyFoo PROPERTIES
55
SUFFIX ".so"
6-
INSTALL_RPATH "@loader_path;@loader_path/../../${PYTHON_PROJECT}/.libs"
6+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
77
)
88
set_property(TARGET pyFoo APPEND PROPERTY
99
LINK_FLAGS "-flat_namespace -undefined suppress"
1010
)
1111
elseif(UNIX)
1212
set_target_properties(pyFoo PROPERTIES
13-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../${PYTHON_PROJECT}/.libs"
13+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
1414
)
1515
endif()
1616
target_link_libraries(pyFoo PRIVATE ${PROJECT_NAMESPACE}::Foo)

‎FooBar/python/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ pybind11_add_module(pyFooBar MODULE pyFooBar.cpp)
33
if(APPLE)
44
set_target_properties(pyFooBar PROPERTIES
55
SUFFIX ".so"
6-
INSTALL_RPATH "@loader_path;@loader_path/../../${PYTHON_PROJECT}/.libs"
6+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
77
)
88
set_property(TARGET pyFooBar APPEND PROPERTY
99
LINK_FLAGS "-flat_namespace -undefined suppress"
1010
)
1111
elseif(UNIX)
1212
set_target_properties(pyFooBar PROPERTIES
13-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../${PYTHON_PROJECT}/.libs"
13+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
1414
)
1515
endif()
1616
target_link_libraries(pyFooBar PRIVATE ${PROJECT_NAMESPACE}::FooBar)

‎ci/samples/sample.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import cmakepybind11
2-
from cmakepybind11.foo import pyFoo
3-
from cmakepybind11.bar import pyBar
4-
from cmakepybind11.foobar import pyFooBar
1+
import cmpb11
2+
from cmpb11.foo.python import pyFoo
3+
from cmpb11.bar.python import pyBar
4+
from cmpb11.foobar.python import pyFooBar
55

6-
print(f'version: {cmakepybind11.__version__}')
6+
print(f'version: {cmpb11.__version__}')
77

88
# foo
99
print(f'Foo: {dir(pyFoo.Foo)}')

‎examples/example.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import cmakepybind11
2-
from cmakepybind11.foo import pyFoo
3-
from cmakepybind11.bar import pyBar
4-
from cmakepybind11.foobar import pyFooBar
1+
import cmpb11
2+
from cmpb11.foo.python import pyFoo
3+
from cmpb11.bar.python import pyBar
4+
from cmpb11.foobar.python import pyFooBar
55

6-
print(f'version: {cmakepybind11.__version__}')
6+
print(f'version: {cmpb11.__version__}')
77

88
# foo
99
print(f'Foo: {dir(pyFoo.Foo)}')

‎tests/bar.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
'''Test APIs'''
33

44
import unittest
5-
import cmakepybind11
6-
from cmakepybind11.bar import pyBar
7-
#import cmakepybind11.bar.pyBar as bar
5+
import cmpb11
6+
from cmpb11.bar.python import pyBar
7+
#import cmpb11.bar.python.pyBar as bar
88

99
if __debug__:
10-
print(f'version: {cmakepybind11.__version__}')
11-
print(f'cmakepybind11: ${dir(cmakepybind11)}')
12-
print(f'cmakepybind11.bar: ${dir(cmakepybind11.bar)}')
10+
print(f'version: {cmpb11.__version__}')
11+
print(f'cmpb11: ${dir(cmpb11)}')
12+
print(f'cmpb11.bar: ${dir(cmpb11.bar)}')
13+
print(f'cmpb11.bar.python: ${dir(cmpb11.bar.python)}')
1314
print(f'pyBar: ${dir(pyBar)}')
1415

1516

‎tests/foo.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
'''Test APIs'''
33

44
import unittest
5-
import cmakepybind11
6-
from cmakepybind11.foo import pyFoo
7-
#import cmakepybind11.foo.pyFoo as foo
5+
import cmpb11
6+
from cmpb11.foo.python import pyFoo
7+
#import cmpb11.foo.python.pyFoo as foo
88

99
if __debug__:
10-
print(f'version: {cmakepybind11.__version__}')
11-
print(f'cmakepybind11: ${dir(cmakepybind11)}')
12-
print(f'cmakepybind11.foo: ${dir(cmakepybind11.foo)}')
10+
print(f'version: {cmpb11.__version__}')
11+
print(f'cmpb11: ${dir(cmpb11)}')
12+
print(f'cmpb11.foo: ${dir(cmpb11.foo)}')
13+
print(f'cmpb11.foo.python: ${dir(cmpb11.foo.python)}')
1314
print(f'pyFoo: ${dir(pyFoo)}')
1415

1516

‎tests/foobar.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
'''Test APIs'''
33

44
import unittest
5-
import cmakepybind11
6-
from cmakepybind11.foobar import pyFooBar
7-
#import cmakepybind11.foobar.pyFooBar as foobar
5+
import cmpb11
6+
from cmpb11.foobar.python import pyFooBar
7+
#import cmpb11.foobar.python.pyFooBar as foobar
88

99
if __debug__:
10-
print(f'version: {cmakepybind11.__version__}')
11-
print(f'cmakepybind11: ${dir(cmakepybind11)}')
12-
print(f'cmakepybind11.foobar: ${dir(cmakepybind11.foobar)}')
10+
print(f'version: {cmpb11.__version__}')
11+
print(f'cmpb11: ${dir(cmpb11)}')
12+
print(f'cmpb11.foobar: ${dir(cmpb11.foobar)}')
13+
print(f'cmpb11.foobar.python: ${dir(cmpb11.foobar.python)}')
1314
print(f'pyFooBar: ${dir(pyFooBar)}')
1415

1516

0 commit comments

Comments
 (0)