formatting edits only

This commit is contained in:
Campbell Barton
2011-09-30 15:51:58 +00:00
parent 2bb59bc273
commit cf3956f450
3 changed files with 71 additions and 61 deletions

View File

@@ -381,10 +381,12 @@ if(UNIX AND NOT APPLE)
if(WITH_SDL) if(WITH_SDL)
find_package(SDL) find_package(SDL)
mark_as_advanced(SDLMAIN_LIBRARY) mark_as_advanced(
mark_as_advanced(SDL_INCLUDE_DIR) SDLMAIN_LIBRARY
mark_as_advanced(SDL_LIBRARY) SDL_INCLUDE_DIR
mark_as_advanced(SDL_LIBRARY_TEMP) SDL_LIBRARY
SDL_LIBRARY_TEMP
)
# unset(SDLMAIN_LIBRARY CACHE) # unset(SDLMAIN_LIBRARY CACHE)
if(NOT SDL_FOUND) if(NOT SDL_FOUND)
set(WITH_SDL OFF) set(WITH_SDL OFF)
@@ -428,8 +430,10 @@ if(UNIX AND NOT APPLE)
PATHS PATHS
/sw/lib /sw/lib
) )
mark_as_advanced(ICONV_LIBRARY) mark_as_advanced(
mark_as_advanced(INTL_LIBRARY) ICONV_LIBRARY
INTL_LIBRARY
)
if(INTL_LIBRARY AND ICONV_LIBRARY) if(INTL_LIBRARY AND ICONV_LIBRARY)
set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY}) set(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
@@ -1214,8 +1218,10 @@ if(WITH_OPENMP)
set(WITH_OPENMP OFF) set(WITH_OPENMP OFF)
endif() endif()
mark_as_advanced(OpenMP_C_FLAGS) mark_as_advanced(
mark_as_advanced(OpenMP_CXX_FLAGS) OpenMP_C_FLAGS
OpenMP_CXX_FLAGS
)
endif() endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -1231,8 +1237,10 @@ else()
message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW") message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
endif() endif()
mark_as_advanced(GLEW_LIBRARY) mark_as_advanced(
mark_as_advanced(GLEW_INCLUDE_PATH) GLEW_LIBRARY
GLEW_INCLUDE_PATH
)
endif() endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

View File

@@ -535,8 +535,10 @@ macro(blender_project_hack_post)
# have libs we define and that cmake & scons builds match. # have libs we define and that cmake & scons builds match.
set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE) set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE) set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES) mark_as_advanced(
mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES) CMAKE_C_STANDARD_LIBRARIES
CMAKE_CXX_STANDARD_LIBRARIES
)
endif() endif()
unset(_reset_standard_libraries) unset(_reset_standard_libraries)