Rework CMake files and build scripts

Rename variables
Add better support for custom runtime libraries
Add clean separation between Windows 32 and 64 bit
Add new BAT build scripts for Win64-Build

Author: Boris Brodski

CMakeLists.txt

@@ -1,23 +1,35 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(SevenZipJBinding)
 
 # Compile on Mac OS https://bug477945.bugzilla.mozilla.org/attachment.cgi?id=376115
 # 64 bit java: /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/java
 # CC="gcc-4.2 -arch i386"
 # CXX="g++-4.2 -arch i386"
 
+SET(CMAKE_BUILD_TYPE Release CACHE STRING "Build target: Release or Debug")
 
-# Uncomment to build in debug mode
-# SET(CMAKE_BUILD_TYPE Debug)
+SET(MINGW32     No CACHE BOOL "Use MinGW toolchain (32 bit)")
+SET(MINGW64     No CACHE BOOL "Use MinGW toolchain (64 bit)")
+SET(RUNTIME_LIB CACHE BOOL "Compiler runtime library to package and load before 7-Zip-JBinding")
 
-# Uncomment to build Windows 64 version
-# SET(USE_MINGW_W64 Yes)
+SET(JAVA_TMP       CACHE PATH "Path to tmp directory")
 
-IF (NOT CMAKE_BUILD_TYPE)
-    SET(CMAKE_BUILD_TYPE Release)
+IF (MINGW32 OR MINGW64)
+    SET(MINGW Yes)
+ELSE()
+    SET(MINGW No)
+ENDIF()
+
+SET(WINDOWS ${CMAKE_HOST_WIN32}) #true also for win64
+
+
+IF(CMAKE_SYSTEM_NAME MATCHES "Windows.*")
+    SET(WINDOWS Yes)
 ENDIF()
 
-SET(JAVA_TMP CACHE PATH "Path to tmp directory (optional)")
+IF(WINDOWS AND NOT MINGW)
+    MESSAGE(FATAL_ERROR "On Windows only MinGW build is supported")
+ENDIF()
 
 INCLUDE(cmake/FindJavaExtended.cmake)
 #INCLUDE(cmake/CheckGCC.cmake)
@@ -37,31 +49,21 @@ IF("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") # TODO Switch to JAVA_SYSTEM
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch ${JAVA_ARCH}")
 ENDIF()
 
-#IF(USE_MINGW_W64)
 SET(PLATFORM ${JAVA_SYSTEM}-${JAVA_ARCH})
-#ELSE()
-#	SET(PLATFORM ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-#ENDIF()
 
 SET(SEVENZIPJBINDING_LIB_JAR ${PROJECT_BINARY_DIR}/sevenzipjbinding-${PLATFORM}.jar)
 SET(SEVENZIPJBINDING_FILENAME sevenzipjbinding${SEVENZIPJBINDING_VERSON_POSTFIX}-${PLATFORM})
 SET(SEVENZIPJBINDING_SOURCE_FILENAME sevenzipjbinding${SEVENZIPJBINDING_VERSON_POSTFIX}-src)
-#SET(SEVENZIPJBINDING_ZIP ${RELEASE_PATH}/${SEVENZIPJBINDING_FILENAME}.zip)
-
-# ------------------- Java -------------------
-
-# Variables:
-#
-# JAVA_SOURCE_DIR               - path to java source code
-# SEVENZIP_JBINDING_JAR         - (global) target JAR file
 
 SET(JAVA_SOURCE_DIR ${PROJECT_SOURCE_DIR}/jbinding-java/src)
 SET(SEVENZIP_JBINDING_JAR ${PROJECT_BINARY_DIR}/jbinding-java/sevenzipjbinding.jar)
 
-FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/jbinding-java)
 SET_PROPERTY(GLOBAL PROPERTY SEVENZIP_JBINDING_JAR ${SEVENZIP_JBINDING_JAR}) 
+SET_PROPERTY(GLOBAL PROPERTY MINGW                 ${MINGW}) 
+SET_PROPERTY(GLOBAL PROPERTY WINDOWS               ${WINDOWS}) 
 
-IF(CMAKE_HOST_WIN32) #true for win64 also
+FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/jbinding-java)
+IF(WINDOWS)
     SET(PATH_SEP ";")
 ELSE()
     SET(PATH_SEP ":")
@@ -123,32 +125,27 @@ ENDIF()
 
 ADD_DEPENDENCIES(7-Zip-JBinding sevenzipjbinding-jar)
 
-GET_PROPERTY(USE_MINGW                GLOBAL PROPERTY     USE_MINGW) 
-GET_PROPERTY(USE_MINGW_W64            GLOBAL PROPERTY     USE_MINGW_W64)
 GET_TARGET_PROPERTY(SEVENZIP_JBINDING_LIB 7-Zip-JBinding LOCATION)
 GET_FILENAME_COMPONENT(SEVENZIP_JBINDING_LIB_FILENAME "${SEVENZIP_JBINDING_LIB}" NAME)
 
 FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${PLATFORM})
 SET(SEVENZIP_JBINDING_LIB_PROPERTY_FILE ${PROJECT_BINARY_DIR}/${PLATFORM}/sevenzipjbinding-lib.properties)
 FILE(WRITE ${SEVENZIP_JBINDING_LIB_PROPERTY_FILE} "sevenzipjbinding.libname.1=${SEVENZIP_JBINDING_LIB_FILENAME}\n")
-IF(USE_MINGW_W64)
-    IF (MINGW_RUNTIME_DLL_FILENAME MATCHES "/.*" AND USE_CYGWIN)
-        IF(NOT CYGPATH_EXE_FILENAME)
-            MESSAGE(FATAL_ERROR "cygpath.exe wasn't found")
-        ENDIF(NOT CYGPATH_EXE_FILENAME)
-        EXECUTE_PROCESS(COMMAND cygpath.exe -m ${MINGW_RUNTIME_DLL_FILENAME} OUTPUT_VARIABLE MINGW_RUNTIME_DLL_FILENAME)
-    ENDIF()
-# !!! TODO
-#    GET_FILENAME_COMPONENT(MINGW_RUNTIME_DLL_DIR ${MINGW_RUNTIME_DLL_FILENAME} PATH)
-    GET_FILENAME_COMPONENT(MINGW_RUNTIME_DLL_NAME ${MINGW_RUNTIME_DLL_FILENAME} NAME)
-    FILE(APPEND ${SEVENZIP_JBINDING_LIB_PROPERTY_FILE} "sevenzipjbinding.libname.2=${MINGW_RUNTIME_DLL_NAME}\n")
-ENDIF(USE_MINGW_W64)
-STRING(RANDOM BUILD_REF)
+IF(RUNTIME_LIB)
+    FILE(APPEND ${SEVENZIP_JBINDING_LIB_PROPERTY_FILE} "sevenzipjbinding.libname.2=${RUNTIME_LIB}\n")
+ENDIF(RUNTIME_LIB)
+STRING(RANDOM LENGTH 12 BUILD_REF)
 FILE(APPEND ${SEVENZIP_JBINDING_LIB_PROPERTY_FILE} "build.ref=${BUILD_REF}\n")
 
 SET(SEVENZIPJBINDING_PLATFORMS_PROPERTY_FILE sevenzipjbinding-platforms.properties)
 FILE(WRITE ${PROJECT_BINARY_DIR}/${SEVENZIPJBINDING_PLATFORMS_PROPERTY_FILE} "platform.1=${PLATFORM}\n")
 
+IF(MINGW)
+    SET(MAKE_COMMAND "mingw32-make")
+ELSE()
+    SET(MAKE_COMMAND "make")
+ENDIF()
+
 MESSAGE("")
 MESSAGE("Build type: ${CMAKE_BUILD_TYPE}, platform: ${PLATFORM}")
 MESSAGE("")
@@ -157,19 +154,18 @@ MESSAGE("Java compiler: ${JAVA_COMPILE}")
 MESSAGE("Java header compiler: ${JAVA_HEADER_COMPILE}")
 MESSAGE("Java documentation tool: ${JAVA_DOC}")
 MESSAGE("Java archiver: ${JAVA_ARCHIVE}")
-    IF(USE_MINGW_W64)
-    MESSAGE("libgcc_s_sjlj-1.dll to use: ${MINGW_RUNTIME_DLL_FILENAME}")
+MESSAGE("MinGW: ${MINGW}")
+MESSAGE("MinGW-32: ${MINGW32}")
+MESSAGE("MinGW-64: ${MINGW64}")
+IF(RUNTIME_LIB)
+    MESSAGE("Runtime libaray to use: ${RUNTIME_LIB_FILENAME}")
 ENDIF()
 MESSAGE("Output package: ./${SEVENZIPJBINDING_FILENAME}.zip")
 MESSAGE("")
 MESSAGE("")
-IF(USE_MINGW)
-    MESSAGE("Type 'mingw32-make' to compile")
-ELSE()
-    MESSAGE("Type 'make' to compile")
-ENDIF()
+MESSAGE("Type '${MAKE_COMMAND}' to compile")
 MESSAGE("Type 'ctest' to run tests (it could take up to 30 minutes on a slow CPU)")
-MESSAGE("Type 'make package' to build a distribution package")
+MESSAGE("Type '${MAKE_COMMAND} package' to build a distribution package")
 MESSAGE("")
 
 ADD_CUSTOM_TARGET(sevenzipjbinding-lib-jar ALL
@@ -192,10 +188,10 @@ ADD_CUSTOM_COMMAND(OUTPUT ${SEVENZIPJBINDING_LIB_JAR}
                    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
                    COMMENT Building Platformdependend jar)
 
-IF(USE_MINGW_W64)
+IF(RUNTIME_LIB)
     ADD_CUSTOM_COMMAND(TARGET sevenzipjbinding-lib-jar POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy
-                                           ${MINGW_RUNTIME_DLL_FILENAME}
+                                           ${RUNTIME_LIB_FILENAME}
                                            ${PLATFORM}
                    COMMAND ${JAVA_ARCHIVE} uf ${SEVENZIPJBINDING_LIB_JAR} 
                                                -C ${PROJECT_BINARY_DIR}
@@ -241,7 +237,7 @@ SET(PREPACKAGE_ACTIONS
     ENDMACRO()
 
     FILE(MAKE_DIRECTORY \"${JAVADOC_DIR}\")
-    EXECUTE_PROCESS(COMMAND ${JAVA_DOC}
+    EXECUTE_PROCESS(COMMAND \"${JAVA_DOC}\"
                                 -public -version -author -quiet
                                 -sourcepath ${PROJECT_SOURCE_DIR}/jbinding-java/src 
                                 -subpackages net.sf.sevenzipjbinding 
@@ -251,13 +247,13 @@ SET(PREPACKAGE_ACTIONS
     COPY_FROM_SRC(\"${PROJECT_SOURCE_DIR}/jbinding-java/src\" \"${PREPACKAGE_TMP}/java-src/\" \"\")
     COPY_FROM_SRC(\"${PROJECT_SOURCE_DIR}/jbinding-cpp\" \"${PREPACKAGE_TMP}/cpp-src/\" CMakeLists.txt)
 
-    EXECUTE_PROCESS(COMMAND ${JAVA_ARCHIVE} cMf ${PREPACKAGE_TMP}/java-src.zip .
+    EXECUTE_PROCESS(COMMAND \"${JAVA_ARCHIVE}\" cMf ${PREPACKAGE_TMP}/java-src.zip .
     WORKING_DIRECTORY ${PREPACKAGE_TMP}/java-src/)
 
-    EXECUTE_PROCESS(COMMAND ${JAVA_ARCHIVE} cMf ${PREPACKAGE_TMP}/cpp-src.zip .
+    EXECUTE_PROCESS(COMMAND \"${JAVA_ARCHIVE}\" cMf ${PREPACKAGE_TMP}/cpp-src.zip .
     WORKING_DIRECTORY ${PREPACKAGE_TMP}/cpp-src/)
 
-    EXECUTE_PROCESS(COMMAND ${JAVA_ARCHIVE} cMf ${PREPACKAGE_TMP}/javadoc.zip .
+    EXECUTE_PROCESS(COMMAND \"${JAVA_ARCHIVE}\" cMf ${PREPACKAGE_TMP}/javadoc.zip .
     WORKING_DIRECTORY ${JAVADOC_DIR})"
 )
 
@@ -314,7 +310,7 @@ IF(BUILD_TESTING)
     SET(JUNIT_TEST_RUNNER ${PROJECT_BINARY_DIR}/JUnitRunner.cmake)
     FILE(WRITE ${JUNIT_TEST_RUNNER} "STRING(REPLACE \"%3D\" \"=\" JAVA_OPT_TO_USE \"\${JAVA_OPT}\")
                                      EXECUTE_PROCESS(COMMAND
-                                            ${JAVA_RUNTIME} -cp \"${JUNIT_LIB}${PATH_SEP}${TESTS_JAR}${PATH_SEP}${SEVENZIP_JBINDING_JAR}${PATH_SEP}${SEVENZIPJBINDING_LIB_JAR}\"
+                                            \"${JAVA_RUNTIME}\" -cp \"${JUNIT_LIB}${PATH_SEP}${TESTS_JAR}${PATH_SEP}${SEVENZIP_JBINDING_JAR}${PATH_SEP}${SEVENZIPJBINDING_LIB_JAR}\"
                                             \"-DSINGLEBUNDLE=\${SINGLEBUNDLE}\" \${JAVA_OPT_TO_USE} ")
     IF(JAVA_TMP)
        FILE(APPEND ${JUNIT_TEST_RUNNER} "\"-Djava.io.tmpdir=${JAVA_TMP}\" ")

cmake/FindMinGWm10-DLL.cmake

@@ -0,0 +1,19 @@
+IF(WINDOWS) #true for win64 also
+    IF(NOT RUNTIME_LIB)
+        MESSAGE(FATAL_ERROR "No runtime library provided. Use -DRUNTIME_LIB=<filename> to specify it")
+    ENDIF()
+
+    MESSAGE("-- Looking for ${RUNTIME_LIB}")
+
+    GET_FILENAME_COMPONENT(COMPILER_BIN_DIR "${CMAKE_CXX_COMPILER}" PATH)
+
+    FIND_FILE(RUNTIME_LIB_FILENAME "${RUNTIME_LIB}" "$ENV{PATH}" "${COMPILER_BIN_DIR}")
+
+    MARK_AS_ADVANCED(RUNTIME_LIB_FILENAME)
+
+    IF(RUNTIME_LIB_FILENAME)
+        MESSAGE("-- Looking for ${RUNTIME_LIB} - found: ${RUNTIME_LIB_FILENAME}")
+    ELSE()
+        MESSAGE(FATAL_ERROR "${RUNTIME_LIB} not found. Please point cmake to ${RUNTIME_LIB} using GUI or -DRUNTIME_LIB_FILENAME=<path-to-lib> option.")
+    ENDIF()
+ENDIF(WINDOWS)