Fix new (WIP) cmake setup to work on OS/X

This includes a fix for the semaphore configure check as well as a couple of compile warnings Signed-off-by: Kimball Thurston <[email protected]>
AcademySoftwareFoundation · Jul 17, 2019 · 2fe5a26 · 2fe5a26
1 parent 9a1ca75
commit 2fe5a26
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/IlmBase/IlmThread/IlmThreadSemaphore.h b/IlmBase/IlmThread/IlmThreadSemaphore.h
@@ -52,9 +52,9 @@
 #   endif
 #   define NOMINMAX
 #   include <windows.h>
-#elif HAVE_POSIX_SEMAPHORES
+#elif defined(HAVE_POSIX_SEMAPHORES)
 #   include <semaphore.h>
-#elif __APPLE__
+#elif defined(__APPLE__)
 #   include <dispatch/dispatch.h>
 #else
 #   ifdef ILMBASE_FORCE_CXX03

diff --git a/IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp b/IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp
@@ -39,7 +39,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#if __APPLE__
+#if defined(__APPLE__)
 
 #include "IlmThreadSemaphore.h"
 #include "Iex.h"

diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
@@ -32,16 +32,18 @@ if(Threads_FOUND)
 
   # we have threads, but do we have posix semaphores for sem_init?
   # should be in pthreads
-  check_include_files(semaphore.h ILMBASE_HAVE_SEMAPHORE_H)
-  if(ILMBASE_HAVE_SEMAPHORE_H AND ILMBASE_HAVE_PTHREAD)
-    # should just be in libc, so no need for check_library_exists
-    set(CMAKE_REQUIRED_FLAGS ${CMAKE_THREAD_LIBS_INIT})
-    check_library_exists(pthread sem_init "" ILMBASE_HAVE_POSIX_SEMAPHORES)
-    # TODO: remove this once we cleanly have ILMBASE_ prefix on all #defines
-    if(ILMBASE_HAVE_POSIX_SEMAPHORES)
-      set(HAVE_POSIX_SEMAPHORES ON)
+  if(NOT APPLE)
+    check_include_files(semaphore.h ILMBASE_HAVE_SEMAPHORE_H)
+    if(ILMBASE_HAVE_SEMAPHORE_H AND ILMBASE_HAVE_PTHREAD)
+      # should just be in libc, so no need for check_library_exists
+      set(CMAKE_REQUIRED_FLAGS ${CMAKE_THREAD_LIBS_INIT})
+      check_library_exists(pthread sem_init "" ILMBASE_HAVE_POSIX_SEMAPHORES)
+      # TODO: remove this once we cleanly have ILMBASE_ prefix on all #defines
+      if(ILMBASE_HAVE_POSIX_SEMAPHORES)
+        set(HAVE_POSIX_SEMAPHORES ON)
+      endif()
+      set(CMAKE_REQUIRED_FLAGS)
     endif()
-    set(CMAKE_REQUIRED_FLAGS)
   endif()
 endif()
 

diff --git a/OpenEXR/IlmImfTest/testBadTypeAttributes.cpp b/OpenEXR/IlmImfTest/testBadTypeAttributes.cpp
@@ -115,17 +115,22 @@ template<class T> void readTiledThing(T & input,bool test)
         case ONE_LEVEL :
             x_levels = 1;
             y_levels = 1;
-        break;
+			break;
         case MIPMAP_LEVELS :
             x_levels = input.numXLevels();
             y_levels = 1;
             break;
         case RIPMAP_LEVELS :
             x_levels = input.numXLevels();
             y_levels = input.numYLevels();
+			break;
+		case NUM_LEVELMODES:
+		default:
+			std::cerr << "Invalid tile mode " << int(t.mode) << std::endl;
+			break;
     }
-        
-    for(int x_level = 0 ; x_level < x_levels ; x_level++)
+
+	for(int x_level = 0 ; x_level < x_levels ; x_level++)
     {
         for(int y_level = 0 ; y_level < y_levels ;y_level++)
         {

diff --git a/OpenEXR/IlmImfTest/testScanLineApi.cpp b/OpenEXR/IlmImfTest/testScanLineApi.cpp
@@ -238,6 +238,10 @@ writeRead (const Array2D<unsigned int> &pi1,
             }
           }
           break;
+			case NUM_LEVELMODES:
+			default:
+				std::cerr << "Invalid tile mode " << int(mode) << std::endl;
+				break;
         }
     }
 

diff --git a/OpenEXR/IlmImfTest/testYca.cpp b/OpenEXR/IlmImfTest/testYca.cpp
@@ -165,6 +165,10 @@ writeReadYca (const char fileName[],
 	    }
 
 	    break;
+		case NUM_LINEORDERS:
+		default:
+			cerr << "invalid line order " << int(readOrder) << std::endl;
+			break;
 	}
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,6 +238,10 @@ writeRead (const Array2D<unsigned int> &pi1, @@
                 }
               }
               break;
+    			case NUM_LEVELMODES:
+    			default:
+    				std::cerr << "Invalid tile mode " << int(mode) << std::endl;
+    				break;
             }
         }
@@ Expand Down @@