Merge pull request #115 from valnoel/fix_build_windows

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 6e6e9a7d0e82 · 2014-10-23T02:17:10.000-07:00
Fix build windows
diff --git 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)
@@ -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})
@@ -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(
