Skip to content

Fix build windows #115

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

Merged
merged 2 commits into from
Oct 23, 2014
Merged

Fix build windows #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6a4a4f
Windows: get python libs version with CMAKE
Oct 21, 2014
3268aeb
CMake: set package name to low case and add version to the generated JAR
valnoel Oct 22, 2014
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
21 changes: 15 additions & 6 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,19 @@ if(SWIG_FOUND)
if(PYTHONLIBS_FOUND)
include_directories(${PYTHON_INCLUDE_PATH})

# Get Python version from include path
string(LENGTH ${PYTHON_INCLUDE_DIR} PYTHON_INCLUDE_DIRS_LENGTH)
math(EXPR PYTHON_INCLUDE_DIRS_LENGTH "${PYTHON_INCLUDE_DIRS_LENGTH} - 3" )
string(SUBSTRING ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS_LENGTH} 3 PYTHONLIBS_VERSION_STRING)
if(${CMAKE_VERSION} STRLESS 2.8.8)
# Get Python version from include path
string(LENGTH ${PYTHON_INCLUDE_DIR} PYTHON_INCLUDE_DIRS_LENGTH)
if(WIN32)
set(PYTHON_INCLUDE_DIRS_LENGTH_EXPRESSION "${PYTHON_INCLUDE_DIRS_LENGTH} - 10")
set(PYTHON_VERSION_LENGTH_EXPRESSION "2")
else()
set(PYTHON_INCLUDE_DIRS_LENGTH_EXPRESSION "${PYTHON_INCLUDE_DIRS_LENGTH} - 3")
set(PYTHON_VERSION_LENGTH_EXPRESSION "3")
endif()
math(EXPR PYTHON_INCLUDE_DIRS_LENGTH ${PYTHON_INCLUDE_DIRS_LENGTH_EXPRESSION} )
string(SUBSTRING ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS_LENGTH} ${PYTHON_VERSION_LENGTH_EXPRESSION} PYTHONLIBS_VERSION_STRING)
endif()

# Swig flags
set(CMAKE_SWIG_FLAGS -c++ -fcompact)
Expand Down Expand Up @@ -101,7 +110,7 @@ if(SWIG_FOUND)
include_directories(${JNI_INCLUDE_DIRS})

# Swig flags
set(CMAKE_SWIG_FLAGS -c++ -fcompact -package org.AvTranscoder)
set(CMAKE_SWIG_FLAGS -c++ -fcompact -package org.avtranscoder)

# Create 'avtranscoder-java' shared lib
swig_add_module(avtranscoder-java java ${AVTRANSCODER_BINDING_FILE})
Expand All @@ -115,7 +124,7 @@ if(SWIG_FOUND)
set(AVTRANSCODER_JAVA_OUTPUT_PATH "${PROJECT_BINARY_DIR}/src/AvTranscoder")
set(AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH "${AVTRANSCODER_JAVA_OUTPUT_PATH}/target")
set(AVTRANSCODER_JAR_PATH "${PROJECT_BINARY_DIR}/src")
set(AVTRANSCODER_JAR_NAME "avtranscoder.jar")
set(AVTRANSCODER_JAR_NAME "avtranscoder-${AVTRANSCODER_VERSION}.jar")
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH})

ADD_CUSTOM_COMMAND(
Expand Down