Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Slightly reorganize a CMake and updated version number #97

Merged
merged 4 commits into from
Nov 2, 2019
Merged

Slightly reorganize a CMake and updated version number #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c512ce
modified ezc3d version
pariterre Oct 25, 2019
2eff499
Merge remote-tracking branch 'origin/dev' into dev
pariterre Oct 25, 2019
30bfb64
Merge remote-tracking branch 'pyomeca/dev' into dev
pariterre Oct 25, 2019
04f3bbd
Merge remote-tracking branch 'pyomeca/dev' into dev
pariterre Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.8)
cmake_policy(SET CMP0048 NEW)
project(ezc3d VERSION 1.2.1)
project(ezc3d VERSION 1.2.2)
set(CMAKE_CXX_STANDARD 11)

# Set some variables
Expand Down
7 changes: 4 additions & 3 deletions binding/python3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.py
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
DESTINATION ${Python3_SITELIB}/${PROJECT_NAME}
)


# Create the version file
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/_version.py.i ${CMAKE_CURRENT_BINARY_DIR}/_version.py)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_version.py
DESTINATION ${Python3_SITELIB}/${PROJECT_NAME}
)
Expand All @@ -58,9 +62,6 @@ else()
message( FATAL_ERROR "Swig must be version 3 or 4" )
endif()

# Create the version file
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/_version.py.i ${CMAKE_CURRENT_BINARY_DIR}/_version.py)

# Install the library
INSTALL(TARGETS _${PROJECT_NAME}
DESTINATION ${PYTHON_INSTALL_DESTINATION}
Expand Down