Merge pull request #119 from twasilczyk/master

Don't build libj1939 for Android
2019-01-14 14:48:48 +01:00 · 2019-01-14 14:48:48 +01:00 · 2328c6cfa0
parent e0277cc960 4da344b2aa
commit 2328c6cfa0
1 changed files with 4 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -63,6 +63,10 @@ set(PROGRAMS

 if(NOT ANDROID)
  list(APPEND PROGRAMS ${PROGRAMS_J1939})
+
+  add_library(j1939 STATIC
+      libj1939.c
+  )
 endif()

 add_library(can STATIC
@ -70,10 +74,6 @@ add_library(can STATIC
    canframelen.c
 )

-add_library(j1939 STATIC
-    libj1939.c
-)
-
 foreach(name ${PROGRAMS})
  add_executable(${name} ${name}.c)