1. 22 Mar, 2013 4 commits
    • Misty De Meo's avatar
      Fix ant/Java detection in cmake scripts · a423afdd
      Misty De Meo authored
      Mac OS X 10.7 and newer don't come with Java installed. They do
      include some stub binaries, which ask the user if they want to
      install Java when run.
      
      OpenCV's cmake script just checks for the existence of an ant
      binary and assumes that Java's available if ant is. As a result,
      cmake will configure the build to use Java and it will fail once
      it tries to compile the Java bindings.
      
      This fixes the issue by checking for the exit status of
      `ant -version` - it exits 0 if Java is installed, or 1
      otherwise.
      a423afdd
    • Andrey Kamaev's avatar
      Merge pull request #690 from berak:master · ec15d6f3
      Andrey Kamaev authored
      ec15d6f3
    • Andrey Kamaev's avatar
      82d7292e
    • berak's avatar
      Update CMakeLists.txt · d32af86e
      berak authored
      exclude IlmImf/b44ExpLogTable.cpp from the build,
      
      it's used originally to generate IlmImf/b44ExpLogTable.h, but not nessecary for the library.(probably only here for documentation
      
      when included with static linking it introduces a problem with multiple definitions of main()
      d32af86e
  2. 21 Mar, 2013 35 commits
  3. 20 Mar, 2013 1 commit