diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-28 08:32:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-28 08:32:39 +0400 |
| commit | f75711db7fd3565925880f8a2ea89088334c35bf (patch) | |
| tree | 2e285a179ff905a9de0c3da8b8265d575852f4ef /CMakeLists.txt | |
| parent | 48a637a4e4a4ab2a8c98caa1bf1ee17940b67d23 (diff) | |
cmake: set python, llvm and osl libs as advanced.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2395b653f97..a8df8301584 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -771,14 +771,14 @@ if(UNIX AND NOT APPLE) endif() if(LLVM_DIRECTORY) - FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH) + find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH) if(NOT LLVM_CONFIG) - FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH) + find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH) endif() else() - FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION}) + find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION}) if(NOT LLVM_CONFIG) - FIND_PROGRAM(LLVM_CONFIG llvm-config) + find_program(LLVM_CONFIG llvm-config) endif() endif() execute_process(COMMAND ${LLVM_CONFIG} --version @@ -2145,6 +2145,23 @@ endif() set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}") set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}") +# defined above, platform spesific but shared names +mark_as_advanced( + CYCLES_OSL + OSL_LIB_EXEC + OSL_COMPILER + OSL_LIB_COMP + OSL_LIB_QUERY + OSL_INCLUDES +) + +mark_as_advanced( + LLVM_CONFIG + LLVM_DIRECTORY + LLVM_LIBRARY + LLVM_VERSION +) + #------------------------------------------------------------------------------- # Global Defines |