Simplify Travis-CI logic, add macOS builds (#11)

Author: tresf

.travis.yml

@@ -5,18 +5,21 @@ cache:
     - '$HOME/.m2'
     - '$HOME/.jabba/jdk'
 
-
-addons:
-  apt:
-    packages:
-    - cmake
-    - make
-    - gcc
-    - g++
-    - libc6-dev
-
-
-script: mvn --fail-never --batch-mode test
+matrix:
+  include:
+    - os: linux
+      addons:
+        apt:
+          packages:
+            - cmake3
+            - g++
+    - os: osx
+      addons:
+        homebrew:
+          packages:
+            - cmake
+
+script: mvn --batch-mode test
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

CMakeLists.txt

@@ -1,13 +1,7 @@
-cmake_minimum_required(VERSION 2.7)
-project(jssc
-  # FIXME: add back if we can get the cmake min version > 3.
-  # VERSION 2.7.1
-  # FIXME: Dropped Languages for cmake <3.0 for now.
-  #LANGUAGES CXX
-  )
-
-# not supported in early cmake versions.
-# DESCRIPTION "Java Simple Serial Connector"
+cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0042 NEW)
+project(jssc VERSION 2.7.1 LANGUAGES CXX)
 
 find_package(Java)
 find_package(JNI)
@@ -70,17 +64,31 @@ list(APPEND JSSC_ADDITIONAL_INCLUDES target/nar/javah-include/)
 
 # output to maven conventions to target/generated-sources/<generator>
 # The other part will be in conventions to native-lib-loader.
-# FIXME: get platorm name from maven(?) or by using if/else/endif
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../classes/META-INF/lib/linux_64)
+
+# linux, macos, etc
+string(TOLOWER "${CMAKE_SYSTEM_NAME}" OS_NAME)
+if(APPLE)
+	# scijava expects "osx", not "darwin"
+	set(OS_NAME "osx")
+endif()
+
+# 32-bit or 64-bit
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	set(OS_BITS 64)
+else()
+	set(OS_BITS 32)
+endif()
+
+# library (e.g. linux_64.so) TODO: Handle arm, hardfloat, etc
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../classes/META-INF/lib/${OS_NAME}_${OS_BITS})
 
 add_library(jssc SHARED
     src/cpp/${JSSC_PLATFORM}/jssc.cpp
 )
 
 target_include_directories(jssc PRIVATE ${JNI_INCLUDE_DIRS} ${JSSC_ADDITIONAL_INCLUDES})
 
-# FIXME: add back if we can get the cmake min version > 3.
-# set_target_properties(jssc PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(jssc PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties(jssc PROPERTIES PUBLIC_HEADER target/nar/javah-include/jssc_SerialNativeInterface.h)
 set_target_properties(jssc PROPERTIES POSITION_INDEPENDENT_CODE ON)
 

pom.xml

@@ -14,7 +14,7 @@
     <maven.compiler.release>6</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <!-- used to skip javah execution for java9+, see profile below. -->
+    <!-- skip javah execution for java9+, see profile below. -->
     <javah.skip>false</javah.skip>
     <cmake.download.binaries>false</cmake.download.binaries>
     <!-- cmake maven plugin -->
@@ -87,14 +87,13 @@
             <configuration>
               <sourcePath>${project.basedir}</sourcePath>
               <targetPath>${project.build.directory}/cmake</targetPath>
+              <!--FIXME "Makefiles" should be optional see cmake-maven-project/cmake-maven-project#7 -->
               <generator>Unix Makefiles</generator>
+              <!--TODO Use -DCMAKE_TOOLCHAIN_FILE file for cross-compile
               <options>
-                <!--
-                  Optional: One or more options found at https://cmake.org/cmake/help/v3.7/manual/cmake.1.html
-                  For example:
-                -->
-                <option>-DBUILD_THIRDPARTY:bool=on</option>
+                <option>-DCMAKE_TOOLCHAIN_FILE=toolchain/Mingw64.cmake</option>
               </options>
+              -->
             </configuration>
           </execution>
 
@@ -169,13 +168,12 @@
       </properties>
     </profile>
 
-    <!-- cmake mac (any arch) profile -->
+    <!-- cmake mac profile -->
     <profile>
       <id>cmake-macos</id>
       <activation>
         <os>
           <family>mac</family>
-          <!-- any arch -->
         </os>
       </activation>
       <properties>