Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial removal of all Imath source files and minimal cmake adjustments #791

Merged
merged 5 commits into from
Jul 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions IlmBase/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,28 @@ include(config/ParseConfigure.cmake)
#set up our project
project(IlmBase VERSION ${ILMBASE_VERSION} LANGUAGES C CXX)

find_package(Imath QUIET)

if(NOT Imath_FOUND)
message("Imath was not found. It is going to be cloned and installed.")

include(ExternalProject)

set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/Imath)

ExternalProject_Add(Imath
GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/Imath.git
GIT_TAG origin/master
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION} -DPYTHON=${PYTHON}
# Python bindings will be generated for Imath if PYTHON=ON
)

include_directories(${EXTERNAL_INSTALL_LOCATION}/include)
link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)

endif()


#######################################
#######################################
# This declares all the configuration variables visible
Expand All @@ -41,10 +63,8 @@ add_subdirectory(config)
# the libraries
include(config/LibraryDefine.cmake)

add_subdirectory( Half )
add_subdirectory( Iex )
add_subdirectory( IexMath )
add_subdirectory( Imath )
add_subdirectory( IlmThread )

# Can't seem to do EXCLUDE_FROM_ALL on the test executables
Expand All @@ -54,7 +74,5 @@ include(CTest)
if(BUILD_TESTING)
enable_testing()

add_subdirectory( HalfTest )
add_subdirectory( IexTest )
add_subdirectory( ImathTest )
endif()
16 changes: 0 additions & 16 deletions IlmBase/Half/.cvsignore

This file was deleted.

16 changes: 0 additions & 16 deletions IlmBase/Half/CMakeLists.txt

This file was deleted.

40 changes: 0 additions & 40 deletions IlmBase/Half/Makefile.am

This file was deleted.

114 changes: 0 additions & 114 deletions IlmBase/Half/eLut.cpp

This file was deleted.

71 changes: 0 additions & 71 deletions IlmBase/Half/eLut.h

This file was deleted.

Loading