Final touchup of cmake files before public release

Author: sbrown89

CMakeLists.txt

@@ -51,7 +51,13 @@ set(LIOCONV     "lioconv-win")
 set(LCONFIG     "lconfig")
 set(LDECODER    "ldecoder")
 set(LQRCODE     "lqrcode")
-set(LZBAR       "libzbar")
+set(LZBAR       "")
+
+if(WIN32)
+    set(LZBAR       "libzbar")
+else()
+    set(LZBAR       "zbar")
+endif()
 
 if(WIN32 OR ANDROID OR APPLE)
     include_directories("${PROJECT_SOURCE_DIR}/zbar/libiconv-win/include")

zbar/CMakeLists.txt

@@ -59,9 +59,6 @@ elseif(WIN32)
 
     target_compile_definitions(${LCONFIG} PUBLIC LIB_ZBAR_BUILD)
     target_compile_definitions(${LZBAR} PUBLIC LIB_ZBAR_BUILD)
-elseif(APPLE)
-    #  xcrun --show-sdk-path
-    set(C_HEADERS "/Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk/usr/include")
 endif()
 
 find_file(HAVE_DLFCN_F               "dlfcn.h" "${C_HEADERS}")