Fix #457, (unused) policy tag only in 3.13+ of cmake, no longer needed

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
AcademySoftwareFoundation · Jul 20, 2019 · e69dc21 · e69dc21
1 parent 04e2158
commit e69dc21
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -1,9 +1,6 @@
 # "More Modern" CMake version
 cmake_minimum_required(VERSION 3.12)
 
-# this is for target_sources, new policy converts relative paths to absolute
-cmake_policy(SET CMP0076 NEW)
-
 # we include this first to parse configure.ac and extract the version
 # numbers
 include(config/ParseConfigure.cmake)

diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt
@@ -1,9 +1,6 @@
 # "More Modern" CMake version
 cmake_minimum_required(VERSION 3.12)
 
-# this is for target_sources, new policy converts relative paths to absolute
-cmake_policy(SET CMP0076 NEW)
-
 # we include this first to parse configure.ac and extract the version
 # numbers
 include(config/ParseConfigure.cmake)

diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt
@@ -1,9 +1,6 @@
 # "More Modern" CMake version
 cmake_minimum_required(VERSION 3.12)
 
-# this is for target_sources, new policy converts relative paths to absolute
-cmake_policy(SET CMP0076 NEW)
-
 set(OPENEXR_VIEWERS_VERSION 2.3.0)
 
 project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION})
@@ -32,6 +29,19 @@ ENDIF()
 
 PROJECT (openexr_viewers VERSION ${OPENEXR_VERSION})
 
+if(OPENEXR_BUILD_VIEWERS)
+  message(WARNING "Viewers are currently out of order. Building anyway")
+  SET (FLTK_SKIP_FLUID 1)
+  find_package(FLTK)
+  if(NOT FLTK_FOUND)
+    message(WARNING "FLTK not found, exrdisplay will not be built")
+  endif()
+  find_package(OpenGL)
+  if(NOT OpenGL_FOUND)
+    message(WARNING "OpenGL not found, exrdisplay will not be built")
+  endif()
+endif()
+
 IF(OPENEXR_VIEWERS_STANDALONE)
   INCLUDE(OpenEXRSettings)
 ENDIF()

diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt
@@ -1,9 +1,6 @@
 # "More Modern" CMake version
 cmake_minimum_required(VERSION 3.12)
 
-# this is for target_sources, new policy converts relative paths to absolute
-cmake_policy(SET CMP0076 NEW)
-
 # we include this first to parse configure.ac and extract the version
 # numbers
 include(config/ParseConfigure.cmake)