Fixed Cmake for test on windows.
Fixed install modules on windows.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
parent
5a06e6f135
commit
d39b10d9ae
2 changed files with 7 additions and 3 deletions
|
|
@ -7,7 +7,7 @@ else()
|
|||
|
||||
if(WIN32)
|
||||
set(TEST_PYTHONPATH "${CMAKE_BINARY_DIR};${CMAKE_SOURCE_DIR}/tests/util")
|
||||
set(TEST_LIBRARY_PATH "$ENV{PATH};${libpyside_BINARY_DIR}")
|
||||
set(TEST_LIBRARY_PATH "${libpyside_BINARY_DIR};$ENV{PATH}")
|
||||
set(LIBRARY_PATH_VAR "PATH")
|
||||
string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}")
|
||||
string(REPLACE "\\" "/" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}")
|
||||
|
|
@ -16,7 +16,7 @@ else()
|
|||
string(REPLACE ";" "\\;" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}")
|
||||
else()
|
||||
set(TEST_PYTHONPATH "${CMAKE_BINARY_DIR}:${CMAKE_SOURCE_DIR}/tests/util")
|
||||
set(TEST_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${libpyside_BINARY_DIR}")
|
||||
set(TEST_LIBRARY_PATH "${libpyside_BINARY_DIR}:$ENV{LD_LIBRARY_PATH}")
|
||||
set(LIBRARY_PATH_VAR "LD_LIBRARY_PATH")
|
||||
endif()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue