Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AcademySoftwareFoundation/OpenColorIO Loading
base: main
Choose a base ref
...
head repository: frederikaalund/OpenColorIO Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 16 files changed
  • 1 contributor

Commits on Sep 11, 2014

  1. Compile fix for the static build on Windows.

    @frederikaalund
    frederikaalund committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    9e94cdc View commit details
    Browse the repository at this point in the history

  2. Made USE_EXTERNAL_* options available through the CMake GUI on Window… 

    …s systems
    @frederikaalund
    frederikaalund committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    fd64f30 View commit details
    Browse the repository at this point in the history

  3. Compile fixes with clang on OSX.

    @frederikaalund
    frederikaalund committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    fb7d718 View commit details
    Browse the repository at this point in the history

  4. Fix building of tests on Windows 7

    @frederikaalund
    frederikaalund committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    9b7bddc View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2014

  1. Fixed OSX (non-clang) and Linux builds. 

    	- Fixed when the OCIO_BUILD_STATIC flag gets defined so that OCIO also builds on OSX with a non-clang compiler.
	- I accidentally included <unistd.h> for all builds in PathUtils.cpp because of copy-paste errors. This should now be fixed.
    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    df53674 View commit details
    Browse the repository at this point in the history

  2. Forgot to move the " symbol when adding the -DOCIO_BUILD_STATIC line … 

    …to the compile flags
    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    eaeea7a View commit details
    Browse the repository at this point in the history

  3. Now USE_EXTERNAL_LCMS actually has effect.

    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    1dc15be View commit details
    Browse the repository at this point in the history

  4. Fixed static build for ociobakelut.

    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    aa5fe20 View commit details
    Browse the repository at this point in the history

  5. Added missing include directives.

    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    7c303f8 View commit details
    Browse the repository at this point in the history

  6. Fixed CMake warnings (versions 3.0.0 and greater) regarding non-exist… 

    …ent dependencies (CMake policy CMP0046). Added a missing include directive. Added boost dependency to build configuration for yaml-cpp versions 5.0.0 and greater. OCIO now compiles using Visual Studio 14 CTP3.
    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    428792f View commit details
    Browse the repository at this point in the history

  7. External YAML_CPP can now be found on Windows without PKG Config. Sta… 

    …tic builds now don't define any special linkage attributes. This fixes compilation using Visual Studio.
    @frederikaalund
    frederikaalund committed Sep 12, 2014
    Configuration menu
    Copy the full SHA
    3afc721 View commit details
    Browse the repository at this point in the history
Loading