From 2119202ea35b97251d580fe361fa24fde42326af Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Fri, 4 Nov 2022 14:00:58 -0700 Subject: [PATCH] CMake: use of `${PROJECT_NAME}` must be after call to project() --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63335922a5..25a4cb86e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,11 +5,6 @@ cmake_minimum_required (VERSION 3.12) set (OpenImageIO_VERSION "2.5.0.0" CACHE STRING "Version") -set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING - "Build type, for example: dev, beta2, RC1 (empty string for normal release)") -option (${PROJECT_NAME}_SUPPORTED_RELEASE - "Set ON for supported release branch, OFF for master" OFF) - project (OpenImageIO VERSION ${OpenImageIO_VERSION} HOMEPAGE_URL "https://openimageio.org" LANGUAGES CXX C) @@ -17,8 +12,12 @@ project (OpenImageIO VERSION ${OpenImageIO_VERSION} set (PROJ_NAME OIIO) # short name, caps string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case +set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING + "Build type, for example: dev, beta2, RC1 (empty string for normal release)") set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE}) set (PROJECT_AUTHORS "Contributors to the OpenImageIO project") +option (${PROJECT_NAME}_SUPPORTED_RELEASE + "Set ON for supported release branch, OFF for master" OFF) if (${PROJECT_NAME}_SUPPORTED_RELEASE) set (${PROJECT_NAME}_DEV_RELEASE OFF) else () @@ -67,6 +66,7 @@ message (STATUS "Project build dir = ${CMAKE_BINARY_DIR}") message (STATUS "Project install prefix = ${CMAKE_INSTALL_PREFIX}") message (STATUS "Configuration types = ${CMAKE_CONFIGURATION_TYPES}") message (STATUS "Build type = ${CMAKE_BUILD_TYPE}") +message (STATUS "Supported release = ${${PROJECT_NAME}_SUPPORTED_RELEASE}") # Make the build area layout look a bit more like the final dist layout set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)