Updated cmake macros

Author: drahosp

.travis.yml

@@ -2,47 +2,40 @@
 # LuaDist Travis-CI Hook
 #
 
-# Since CMake is not directly supported we use erlang VMs
-language: erlang
-
+# We assume C build environments
+language: C
+	
+# Try using multiple Lua Implementations
 env:
-  - TOOL=""
-  - TOOL="i686-w64-mingw32-"    # 32-bit mingw
-  - TOOL="x86_64-w64-mingw32-"  # 64-bit mingw
-  - TOOL="arm-linux-gnueabihf-" # ARM hard-float (hf), linux
-  - COMPILER="clang"            # clang
-# - TOOL="i586-mingw32msvc-"    # old 32-bit mingw
+  - TOOL=""                     # Use native compiler (GCC usually)
+  - COMPILER="clang"            # Use clang
+  - TOOL="i686-w64-mingw32"     # 32bit MinGW
+  - TOOL="x86_64-w64-mingw32"   # 64bit MinGW
+  - TOOL="arm-linux-gnueabihf"  # ARM hard-float (hf), linux
 
-# We need CMake and toolchains.
+# Crosscompile builds may fail
+matrix:
+  allow_failures:
+    - env: TOOL="i686-w64-mingw32"
+    - env: TOOL="x86_64-w64-mingw32"
+    - env: TOOL="arm-linux-gnueabihf"
+  
+# Install dependencies
 install:
-  - sudo apt-get -qq install cmake
-  - if [ "$TOOL" == "i586-mingw32msvc-" ]; then sudo apt-get -qq install gcc-mingw32; fi
-  - if [ "$TOOL" == "x86_64-w64-mingw32-" -o "$TOOL" == "i686-w64-mingw32-" ]; then sudo apt-get -qq install gcc-mingw-w64; fi
-  - if [ "$TOOL" == "arm-linux-gnueabihf-" ]; then sudo apt-get -qq install gcc-arm-linux-gnueabihf; fi
-  - if [ "$COMPILER" == "clang" ]; then sudo apt-get -qq install clang; export CC=clang; fi
-  - export TOOLFILE="$HOME/$TOOL.cmake"
-  - echo '' > $TOOLFILE
-  - echo "set(_toolchain $TOOL)" >> $TOOLFILE
-  - if [ "$TOOL" == "arm-linux-gnueabihf-" ]; then export SYSTEM="Linux"; else export SYSTEM="Windows"; fi
-  - echo "set(CMAKE_SYSTEM_NAME $SYSTEM)" >> $TOOLFILE
-  - echo 'set(CMAKE_C_COMPILER ${_toolchain}gcc)' >> $TOOLFILE
-  - echo 'set(CMAKE_CXX_COMPILER ${_toolchain}g++)' >> $TOOLFILE
-  - echo 'set(CMAKE_RC_COMPILER ${_toolchain}windres )' >> $TOOLFILE
-  - echo 'set(CMAKE_RC_OUTPUT_EXTENSION .obj)' >> $TOOLFILE
-  - echo 'set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> <DEFINES> <SOURCE> <OBJECT>")' >> $TOOLFILE
-  - echo 'set(CMAKE_FIND_ROOT_PATH /usr/${_toolchain}/ ${CMAKE_INSTALL_PREFIX})' >> $TOOLFILE
-  - echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)' >> $TOOLFILE
-  - echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)' >> $TOOLFILE
+  - git clone git://github.com/LuaDist/_util.git ~/_util
+  - ~/_util/travis install
 
+# Bootstap
+before_script:
+  - ~/_util/travis bootstrap
 
-# Use CMake to build module.
+# Build the module
 script:
-  - mkdir _build _install && cd _build
-  - if [ $TOOL ]; then export TOOLARG="-DCMAKE_TOOLCHAIN_FILE=$TOOLFILE"; fi
-  - cmake $TOOLARG -DCMAKE_INSTALL_PREFIX=../_install ..
-  - make
-  - if [ ! $TOOL ]; then make test; fi
-  - make install
+  - ~/_util/travis build
+
+# Execute additional tests or commands
+#after_script:
+#  - ~/_util/travis test
 
 # Only watch the master branch
 branches:
@@ -55,4 +48,4 @@ notifications:
     - luadist-dev@googlegroups.com
   email:
     on_success: change
-    on_failure: always
+    on_failure: always

CMakeLists.txt

@@ -4,115 +4,69 @@
 # For details see the COPYRIGHT file distributed with LuaDist.
 # Please note that the package source code is licensed under its own license.
 
-project(libjpeg C)
-cmake_minimum_required(VERSION 2.6)
-include(cmake/dist.cmake)
+project ( libjpeg C )
+cmake_minimum_required ( VERSION 2.8 )
+include ( cmake/dist.cmake )
 
-include(CheckIncludeFile)
-check_include_file(stddef.h HAVE_STDDEF_H)
-check_include_file(stdlib.h HAVE_STDLIB_H)
-if(WIN32 AND NOT CYGWIN)  #improve? see jconfig.*
-	set(TWO_FILE_COMMANDLINE true) # jconfig.h
-endif()
-configure_file(jconfig.h.cmake jconfig.h)
+include ( CheckIncludeFile )
+check_include_file ( stddef.h HAVE_STDDEF_H )
+check_include_file ( stdlib.h HAVE_STDLIB_H )
+if ( WIN32 AND NOT CYGWIN )
+  #improve? see jconfig.*
+  set ( TWO_FILE_COMMANDLINE true )
+  # jconfig.h
+endif ( )
+configure_file ( jconfig.h.cmake jconfig.h )
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # jconfig.h
+include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
+# jconfig.h
 
-set(HEADERS
-	jerror.h
-	jmorecfg.h
-	jpeglib.h
-	${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
-)
+set ( HEADERS jerror.h jmorecfg.h jpeglib.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h )
 
-set(SRC
-	jmemnobs.c
-	jaricom.c
-	jcapimin.c
-	jcapistd.c
-	jcarith.c
-	jccoefct.c
-	jccolor.c
-	jcdctmgr.c
-	jchuff.c
-	jcinit.c
-	jcmainct.c
-	jcmarker.c
-	jcmaster.c
-	jcomapi.c
-	jcparam.c
-	jcprepct.c
-	jcsample.c
-	jctrans.c
-	jdapimin.c
-	jdapistd.c
-	jdarith.c
-	jdatadst.c
-	jdatasrc.c
-	jdcoefct.c
-	jdcolor.c
-	jddctmgr.c
-	jdhuff.c
-	jdinput.c
-	jdmainct.c
-	jdmarker.c
-	jdmaster.c
-	jdmerge.c
-	jdpostct.c
-	jdsample.c
-	jdtrans.c
-	jerror.c
-	jfdctflt.c
-	jfdctfst.c
-	jfdctint.c
-	jidctflt.c
-	jidctfst.c
-	jidctint.c
-	jquant1.c
-	jquant2.c
-	jutils.c
-	jmemmgr.c
-	cderror.h
-	cdjpeg.h
-	jdct.h
-	jinclude.h
-	jmemsys.h
-	jpegint.h
-	jversion.h
-	transupp.h
-)
+set ( SRC jmemnobs.c jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c 
+  jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c 
+  jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdarith.c jdatadst.c jdatasrc.c 
+  jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c 
+  jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c 
+  jidctflt.c jidctfst.c jidctint.c jquant1.c jquant2.c jutils.c jmemmgr.c cderror.h 
+  cdjpeg.h jdct.h jinclude.h jmemsys.h jpegint.h jversion.h transupp.h )
 
-add_library(jpeg SHARED ${SRC} ${HEADERS})
+add_library ( jpeg ${SRC} ${HEADERS} )
 
-add_executable(cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c)
-add_executable(djpeg cdjpeg.c djpeg.c wrbmp.c wrgif.c wrppm.c wrrle.c wrtarga.c rdcolmap.c)
-add_executable(jpegtran jpegtran.c cdjpeg.c rdswitch.c transupp.c)
-add_executable(rdjpgcom rdjpgcom.c)
-add_executable(wrjpgcom wrjpgcom.c)
-target_link_libraries(cjpeg jpeg)
-target_link_libraries(djpeg jpeg)
-target_link_libraries(jpegtran jpeg)
+add_executable ( cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c 
+  rdswitch.c )
+add_executable ( djpeg cdjpeg.c djpeg.c wrbmp.c wrgif.c wrppm.c wrrle.c wrtarga.c 
+  rdcolmap.c )
+add_executable ( jpegtran jpegtran.c cdjpeg.c rdswitch.c transupp.c )
+add_executable ( rdjpgcom rdjpgcom.c )
+add_executable ( wrjpgcom wrjpgcom.c )
+target_link_libraries ( cjpeg jpeg )
+target_link_libraries ( djpeg jpeg )
+target_link_libraries ( jpegtran jpeg )
 
-install_executable(cjpeg djpeg jpegtran rdjpgcom wrjpgcom)
-install_library(jpeg)
-install_header(${HEADERS})
-install_doc(
-	README install.txt usage.txt wizard.txt example.c libjpeg.txt
-	structure.txt coderules.txt filelist.txt change.log
-)
+install_executable ( cjpeg djpeg jpegtran rdjpgcom wrjpgcom )
+install_library ( jpeg )
+install_header ( ${HEADERS} )
+install_doc ( README install.txt usage.txt wizard.txt example.c libjpeg.txt structure.txt 
+  coderules.txt filelist.txt change.log )
 
 # tests
-enable_testing()
-macro(mytest name target args input output)
-  get_target_property ( _cmdpath ${target} LOCATION )
-  add_test(${name} ${CMAKE_COMMAND}
-    "-DCOMMAND=${_cmdpath} ${args}" "-DINPUT=${input}" "-DOUTPUT=${output}"
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/jpeg_test.cmake)  
-endmacro()
-set(_src "${CMAKE_CURRENT_SOURCE_DIR}")
-mytest(t1 djpeg "-dct int -ppm -outfile testout.ppm ${_src}/testorig.jpg" "${_src}/testimg.ppm" testout.ppm)
-mytest(t2 djpeg "-dct int -bmp -colors 256 -outfile testout.bmp ${_src}/testorig.jpg" ${_src}/testimg.bmp testout.bmp)
-mytest(t3 cjpeg "-dct int -outfile testout.jpg ${_src}/testimg.ppm" ${_src}/testimg.jpg testout.jpg)
-mytest(t4 djpeg "-dct int -ppm -outfile testoutp.ppm ${_src}/testprog.jpg" ${_src}/testimg.ppm testoutp.ppm)
-mytest(t5 cjpeg "-dct int -progressive -opt -outfile testoutp.jpg ${_src}/testimg.ppm" ${_src}/testimgp.jpg testoutp.jpg)
-mytest(t6 jpegtran "-outfile testoutt.jpg ${_src}/testprog.jpg" ${_src}/testorig.jpg testoutt.jpg)
+enable_testing ( )
+macro ( mytest name target args input output )
+get_target_property ( _cmdpath ${target} LOCATION )
+add_test ( ${name} ${CMAKE_COMMAND} "-DCOMMAND=${_cmdpath} ${args}" "-DINPUT=${input}" 
+  "-DOUTPUT=${output}" -P ${CMAKE_CURRENT_SOURCE_DIR}/jpeg_test.cmake )
+endmacro ( )
+set ( _src "${CMAKE_CURRENT_SOURCE_DIR}" )
+mytest ( t1 djpeg "-dct int -ppm -outfile testout.ppm ${_src}/testorig.jpg" "${_src}/testimg.ppm" 
+  testout.ppm )
+mytest ( t2 djpeg "-dct int -bmp -colors 256 -outfile testout.bmp ${_src}/testorig.jpg" 
+  ${_src}/testimg.bmp testout.bmp )
+mytest ( t3 cjpeg "-dct int -outfile testout.jpg ${_src}/testimg.ppm" ${_src}/testimg.jpg 
+  testout.jpg )
+mytest ( t4 djpeg "-dct int -ppm -outfile testoutp.ppm ${_src}/testprog.jpg" ${_src}/testimg.ppm 
+  testoutp.ppm )
+mytest ( t5 cjpeg "-dct int -progressive -opt -outfile testoutp.jpg ${_src}/testimg.ppm" 
+  ${_src}/testimgp.jpg testoutp.jpg )
+mytest ( t6 jpegtran "-outfile testoutt.jpg ${_src}/testprog.jpg" ${_src}/testorig.jpg 
+  testoutt.jpg )