Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
CrysFML
Commits
2fb12ac8
Commit
2fb12ac8
authored
Jul 21, 2021
by
Simon Ward
Browse files
Update CMakeLists.txt
parent
ec86a092
Pipeline
#10469
failed with stages
in 13 minutes and 9 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Python_API/Src/CMakeLists.txt
View file @
2fb12ac8
...
...
@@ -34,7 +34,7 @@ add_dependencies(${LIBRARY_NAME} crysfml_common)
set
(
Python3_USE_STATIC_LIBS, ON
)
find_package
(
Python3 COMPONENTS Interpreter Development
)
set
(
PYTHON_INTERPRETER_PATH
${
Python3_EXECUTABLE
}
)
#
set(PYTHON_INTERPRETER_PATH ${Python3_EXECUTABLE})
if
(
WIN32 OR MSYS
)
target_link_libraries
(
${
LIBRARY_NAME
}
Python3::Python
)
...
...
@@ -97,7 +97,7 @@ endif (DOXYGEN_FOUND)
# Tests
#################################
# Add tests
add_test
(
NAME
"Python_API_Tests"
COMMAND
${
P
YTHON_INTERPRETER_PATH
}
-m unittest discover
${
CMAKE_CURRENT_BINARY_DIR
}
/../Tests
)
add_test
(
NAME
"Python_API_Tests"
COMMAND
${
P
ython3_EXECUTABLE
}
-m unittest discover
${
CMAKE_CURRENT_BINARY_DIR
}
/../Tests
)
if
(
PYSETUP
)
add_custom_target
(
Python_Files ALL
COMMAND
...
...
@@ -122,10 +122,17 @@ else()
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_BINARY_DIR
}
/../Tests/CFML_api
# COMMAND
# ${CMAKE_COMMAND} -E copy
# ${CMAKE_CURRENT_BINARY_DIR}/${LIBRARY_FILENAME}
# ${CMAKE_CURRENT_BINARY_DIR}/../Tests/CFML_api/${LIBRARY_FILENAME}
# Make this the same as previously implemented.
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
LIBRARY_FILENAME
}
${
CMAKE_CURRENT_BINARY_DIR
}
/../Tests/CFML_api/
${
LIBRARY_FILENAME
}
${
CMAKE_CURRENT_BINARY_DIR
}
/../Tests/CFML_api
)
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