From 1ba1dec95224272cec762cd63354192b27d5fd02 Mon Sep 17 00:00:00 2001 From: Vincent Zhao Date: Tue, 18 Aug 2020 21:24:25 +0100 Subject: [PATCH 1/2] Fixed elseif typos in CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9e0ee7..3a90e52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,10 +125,10 @@ elseif(CURRENT_BUILD_TYPE MATCHES OPTIMIZED) elseif(CURRENT_BUILD_TYPE MATCHES RELWITHDEBINFO) message(STATUS "C compiler = ${CMAKE_C_COMPILER}") message(STATUS "C flags = ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}") -else(CURRENT_BUILD_TYPE MATCHES DEBUG) +elseif(CURRENT_BUILD_TYPE MATCHES DEBUG) message(STATUS "C compiler = ${CMAKE_C_COMPILER}") message(STATUS "C flags = ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") -else(CURRENT_BUILD_TYPE MATCHES DEBUG) +elseif(CURRENT_BUILD_TYPE MATCHES DEBUG) message(STATUS "C compiler = ${CMAKE_C_COMPILER}") message(STATUS "C flags = ${CMAKE_C_FLAGS}") endif(CURRENT_BUILD_TYPE MATCHES RELEASE) From 699ded1e2cd7a0fddea44569ba3858f0bc6b0486 Mon Sep 17 00:00:00 2001 From: Vincent Zhao Date: Tue, 18 Aug 2020 21:36:27 +0100 Subject: [PATCH 2/2] Added missing files to extensions CMakeLists.txt --- source/extensions/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/extensions/CMakeLists.txt b/source/extensions/CMakeLists.txt index 7eaacc9..f7714b9 100644 --- a/source/extensions/CMakeLists.txt +++ b/source/extensions/CMakeLists.txt @@ -1,4 +1,5 @@ set(OSL_EXTENSIONS_CFILES + ${CMAKE_CURRENT_SOURCE_DIR}/annotation.c ${CMAKE_CURRENT_SOURCE_DIR}/arrays.c ${CMAKE_CURRENT_SOURCE_DIR}/clay.c ${CMAKE_CURRENT_SOURCE_DIR}/comment.c @@ -9,6 +10,7 @@ set(OSL_EXTENSIONS_CFILES ${CMAKE_CURRENT_SOURCE_DIR}/loop.c ${CMAKE_CURRENT_SOURCE_DIR}/null.c ${CMAKE_CURRENT_SOURCE_DIR}/pluto_unroll.c + ${CMAKE_CURRENT_SOURCE_DIR}/region.c ${CMAKE_CURRENT_SOURCE_DIR}/scatnames.c ${CMAKE_CURRENT_SOURCE_DIR}/symbols.c ${CMAKE_CURRENT_SOURCE_DIR}/textual.c