Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
| Show First 20 Lines • Show All 1,630 Lines • ▼ Show 20 Lines | |||||
| endif() | endif() | ||||
| # message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}") | # message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}") | ||||
| # message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}") | # message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}") | ||||
| #----------------------------------------------------------------------------- | #----------------------------------------------------------------------------- | ||||
| # Libraries | # Libraries | ||||
| if(WITH_GTESTS) | |||||
| include(GTestTesting) | |||||
| endif() | |||||
| if(WITH_BLENDER) | if(WITH_BLENDER) | ||||
| add_subdirectory(intern) | add_subdirectory(intern) | ||||
| add_subdirectory(extern) | add_subdirectory(extern) | ||||
sergey: Do we care that some libraries (i.e. libmv) adds definitions for GFLAGS and GLOG?
I **think**… | |||||
Done Inline ActionsDo we need to do all this globally? These are already being set in other places, which leads to duplicated defines and unclear code. Is it possible to:
brecht: Do we need to do all this globally? These are already being set in other places, which leads to… | |||||
| # source after intern and extern to gather all | # source after intern and extern to gather all | ||||
| # internal and external library information first, for test linking | # internal and external library information first, for test linking | ||||
| add_subdirectory(source) | add_subdirectory(source) | ||||
| elseif(WITH_CYCLES_STANDALONE) | elseif(WITH_CYCLES_STANDALONE) | ||||
| add_subdirectory(intern/cycles) | add_subdirectory(intern/cycles) | ||||
| add_subdirectory(extern/clew) | add_subdirectory(extern/clew) | ||||
| if(WITH_CUDA_DYNLOAD) | if(WITH_CUDA_DYNLOAD) | ||||
| add_subdirectory(extern/cuew) | add_subdirectory(extern/cuew) | ||||
| ▲ Show 20 Lines • Show All 150 Lines • Show Last 20 Lines | |||||
Do we care that some libraries (i.e. libmv) adds definitions for GFLAGS and GLOG?
I think this is harmless since compiler seems to be smart enough to not warn as long as definition is the same, but could be something to be cleaned up later.