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.

Sign up for GitHub

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

Jump to bottom

Linux CMake support #2560

Merged
merged 3 commits into from Apr 30, 2018
Merged

Linux CMake support #2560

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4846da0
CMake : remove OpenVDB3 API define
dboogert Apr 15, 2018
03c570b
CMake : Ensure we define local include paths before external paths
dboogert Apr 15, 2018
afaa8da
CMake : disable unused local typedefs warning.
dboogert Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions contrib/cmake/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ endif()
IF ( "${CMAKE_BUILD_TYPE}" MATCHES "Debug" )
ADD_DEFINITIONS( -DDEBUG=1 -UNDEBUG )
IF ( NOT WINDOWS )
ADD_DEFINITIONS( -pipe -Wall -O0)
ADD_DEFINITIONS( -pipe -Wall -O0 -Wno-unused-local-typedefs -Wno-strict-aliasing -Wno-maybe-uninitialized)
ENDIF()
ELSEIF ( "${CMAKE_BUILD_TYPE}" MATCHES "Release" )
ADD_DEFINITIONS( -DNDEBUG=1 -UDEBUG )
Expand Down Expand Up @@ -92,6 +92,7 @@ find_package( Qt5 5.6 REQUIRED Core Gui OpenGL )
find_package( Appleseed REQUIRED )
find_package( OpenVDB REQUIRED )

include_directories( ${GAFFER_SOURCE_DIR}/include )
include_directories( ${TBB_INCLUDE_DIRS} )
include_directories( ${PYTHON_INCLUDE_DIRS} )
include_directories( ${Boost_INCLUDE_DIRS} )
Expand All @@ -101,7 +102,6 @@ include_directories( ${Cortex_INCLUDE_DIRS} )
include_directories( ${FREETYPE_INCLUDE_DIRS} )
include_directories( ${CORTEX_ARNOLD_INCLUDE_PATH} )
include_directories( ${APPLESEED_INCLUDE_DIRS} )
include_directories( ${GAFFER_SOURCE_DIR}/include )

link_directories( ${TBB_LIBRARY_DIRS} )
link_directories( ${Boost_LIBRARY_DIRS} )
Expand Down Expand Up @@ -386,12 +386,10 @@ target_link_libraries( GafferVDB ${BASE_LIBS} Gaffer GafferScene ${OpenVDB_LIBRA
# GafferVDB Python Module
add_library( _GafferVDB MODULE ${GAFFERVDB_CXX_MODULE_FILES} )
target_link_libraries( _GafferVDB GafferVDB ${BASE_LIBS} ${BASE_PYTHON_LIBS} GafferBindings GafferScene ${OpenVDB_LIBRARIES} ${Cortex_IECORESCENE_LIBRARY} )
target_compile_options( _GafferVDB PRIVATE -DOPENVDB_3_ABI_COMPATIBLE )

# GafferVDBUI
add_library( GafferVDBUI SHARED ${GAFFERVDBUI_CXX_FILES} ${GAFFERVDBUI_H_FILES} )
target_link_libraries( GafferVDBUI ${BASE_LIBS} Gaffer GafferVDB GafferSceneUI ${OpenVDB_LIBRARIES} ${Cortex_IECOREGL_LIBRARY} )
target_compile_options( GafferVDBUI PRIVATE -DOPENVDB_3_ABI_COMPATIBLE )

# GafferVDBUI Python Module
add_library( _GafferVDBUI MODULE ${GAFFERVDBUI_CXX_MODULE_FILES} )
Expand All @@ -412,7 +410,6 @@ target_compile_options( _GafferAppleseed PRIVATE -DAPPLESEED_ENABLE_IMATH_INTERO
file( GLOB IECOREARNOLD_PREVIEW_CXX_FILES ${GAFFER_SOURCE_DIR}/src/GafferArnold/IECoreArnoldPreview/*.cpp )
add_library( GafferArnold SHARED ${GAFFERARNOLD_CXX_FILES} ${GAFFERARNOLD_H_FILES} ${IECOREARNOLD_PREVIEW_CXX_FILES} )
target_link_libraries( GafferArnold ${BASE_LIBS} Gaffer GafferDispatch GafferScene GafferOSL GafferVDB ${OpenVDB_LIBRARIES} ${CORTEX_ARNOLD_LIBS} ${Cortex_IECOREARNOLD_LIBRARY} )
target_compile_options( GafferArnold PRIVATE -DOPENVDB_3_ABI_COMPATIBLE )

# GafferArnold Python Module
add_library( _GafferArnold MODULE ${GAFFERARNOLD_CXX_MODULE_FILES} )
Expand Down