diff --git a/math/curv/files/patch-CMakeLists.txt b/math/curv/files/patch-CMakeLists.txt index 9a67dffa815b..25ece990b936 100644 --- a/math/curv/files/patch-CMakeLists.txt +++ b/math/curv/files/patch-CMakeLists.txt @@ -1,60 +1,60 @@ ---- CMakeLists.txt.orig 2019-10-15 23:21:21 UTC +--- CMakeLists.txt.orig 2019-12-08 04:12:07 UTC +++ CMakeLists.txt @@ -10,18 +10,14 @@ execute_process(COMMAND sh -c "${CMAKE_SOURCE_DIR}/cma list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") # Global include directories, visible in subdirectories. include_directories(. extern/googletest/googletest/include - extern/double-conversion extern/ordered-map/include - extern/openvdb extern/blosc extern/stb - extern/glfw/include - extern/glm extern/glad) if (APPLE) @@ -30,6 +26,7 @@ if (APPLE) link_directories(/usr/local/lib) endif (APPLE) +# REPLxx used to be unbundled, but due to the incompatibilities (see Bug#241205) it was bundled again # REPLxx library file(GLOB ReplxxSrc "extern/replxx/src/*.cxx" "extern/replxx/src/*.cpp") add_library(replxx ${ReplxxSrc}) @@ -38,10 +35,10 @@ target_include_directories(replxx PRIVATE extern/replxx/src) set_property(TARGET replxx PROPERTY CXX_STANDARD 14) -# double-conversion library -file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc") -add_library(double-conversion ${DoubleConversionSrc}) -set_property(TARGET double-conversion PROPERTY CXX_STANDARD 14) +## double-conversion library +#file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc") +#add_library(double-conversion ${DoubleConversionSrc}) +#set_property(TARGET double-conversion PROPERTY CXX_STANDARD 14) # glad library, an OpenGL loader add_library(glad @@ -93,7 +90,7 @@ target_link_libraries(libcurv_geom PUBLIC imgui) file(GLOB Src "curv/*.c" "curv/*.cc") add_executable(curv ${Src}) -target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb_static Half tbb dl pthread) -+target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb Half tbb dl pthread) ++target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb Imath tbb dl pthread) file(GLOB CurvcSrc "curvc/*.cc") add_executable(curvc EXCLUDE_FROM_ALL ${CurvcSrc}) @@ -128,5 +125,3 @@ if (NOT TARGET uninstall) endif() add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL) -add_subdirectory(extern/openvdb/openvdb EXCLUDE_FROM_ALL) -add_subdirectory(extern/glfw EXCLUDE_FROM_ALL) diff --git a/math/curv/files/patch-cmake_FindILMBase.cmake b/math/curv/files/patch-cmake_FindILMBase.cmake new file mode 100644 index 000000000000..df960f135ab6 --- /dev/null +++ b/math/curv/files/patch-cmake_FindILMBase.cmake @@ -0,0 +1,10 @@ +--- cmake/FindILMBase.cmake.orig 2019-12-08 04:12:07 UTC ++++ cmake/FindILMBase.cmake +@@ -6,6 +6,6 @@ + + SET( ILMBASE_FOUND TRUE ) + SET( ILMBASE_INCLUDE_DIR "" ) +-SET( Ilmbase_HALF_LIBRARY -lHalf ) ++SET( Ilmbase_HALF_LIBRARY -lImath ) + SET( Ilmbase_IEX_LIBRARY -lIex ) + SET( Ilmbase_ILMTHREAD_LIBRARY -lIlmThread )