Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
| Show First 20 Lines • Show All 1,632 Lines • ▼ Show 20 Lines | |||||
| # 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) | if(WITH_GTESTS) | ||||
| include(GTestTesting) | include(GTestTesting) | ||||
| add_definitions(-DWITH_GTESTS) | |||||
| add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) | |||||
| add_definitions(${GFLAGS_DEFINES}) | |||||
| add_definitions(${GLOG_DEFINES}) | |||||
sergey: Do we care that some libraries (i.e. libmv) adds definitions for GFLAGS and GLOG?
I **think**… | |||||
brechtUnsubmitted 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… | |||||
| endif() | endif() | ||||
| if(WITH_BLENDER) | if(WITH_BLENDER) | ||||
| add_subdirectory(intern) | add_subdirectory(intern) | ||||
| add_subdirectory(extern) | add_subdirectory(extern) | ||||
| # 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 | ||||
| ▲ Show 20 Lines • Show All 156 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.