]> granicus.if.org Git - libjpeg-turbo/commitdiff
Fix the build of the Java classes when using MSVC 2010 and later. Something in the...
authorDRC <dcommander@users.sourceforge.net>
Tue, 11 Mar 2014 06:24:46 +0000 (06:24 +0000)
committerDRC <dcommander@users.sourceforge.net>
Tue, 11 Mar 2014 06:24:46 +0000 (06:24 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1149 632fc199-4ca6-4c93-a231-07263d6284db

1  2 
CMakeLists.txt
ChangeLog.txt

diff --cc CMakeLists.txt
index 95677203e6940787db086becb682555824a8b631,d0af65e3ea4f81ca0a25ca3fc186fb2187fc3d51..f88cf4fe66de875d643da8f20a639096f91e57d2
@@@ -2,10 -2,10 +2,10 @@@
  # Setup
  #
  
- cmake_minimum_required(VERSION 2.6)
+ cmake_minimum_required(VERSION 2.8.8)
  
  project(libjpeg-turbo C)
 -set(VERSION 1.3.1)
 +set(VERSION 1.3.80)
  
  if(MINGW OR CYGWIN)
    execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE BUILD)
diff --cc ChangeLog.txt
Simple merge