From d6a4a4f189c6c084035f8d2612dcdb6cf847dbdb Mon Sep 17 00:00:00 2001 From: Valentin Noel Date: Tue, 21 Oct 2014 14:45:43 +0200 Subject: [PATCH 1/2] Windows: get python libs version with CMAKE --- src/CMakeLists.txt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a2e1d8b5..c0a9b047 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) From 3268aeb8096f8dcb8acb517c927ce199f9860ddd Mon Sep 17 00:00:00 2001 From: Valentin NOEL Date: Wed, 22 Oct 2014 18:42:39 +0200 Subject: [PATCH 2/2] CMake: set package name to low case and add version to the generated JAR name --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c0a9b047..6e6d80a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -110,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}) @@ -124,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( pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy