Incorporate review feedback

AcademySoftwareFoundation · Aug 8, 2018 · 99b367d · 99b367d
1 parent b6dc2a6
commit 99b367d
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 48 deletions.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -183,22 +183,11 @@ ENDIF ()
 
 SET (ILMBASE_LIBRARY_NAMES Half Iex Imath IlmThread IexMath)
 FOREACH (LIBNAME ${ILMBASE_LIBRARY_NAMES})
-  IF (LIBNAME STREQUAL "Half")
-    SET(LIBNAMESUFFIX ${LIBNAME})
-  ELSE()
-    SET(LIBNAMESUFFIX ${LIBNAME}${ILMBASE_LIBSUFFIX})
-  ENDIF()
   SET_TARGET_PROPERTIES ( ${LIBNAME}
     PROPERTIES
     VERSION 12.0.0
     SOVERSION 12
-    OUTPUT_NAME "${LIBNAMESUFFIX}"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${RUNTIME_DIR}"
-    ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib"
-    LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib"
-    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${RUNTIME_DIR}"
+    OUTPUT_NAME "${LIBNAME}${ILMBASE_LIBSUFFIX}"
     )
 ENDFOREACH()
 
@@ -234,7 +223,7 @@ OpenEXR_includedir=\${prefix}/include/OpenEXR
 Name: IlmBase
 Description: Base math and exception libraries
 Version: ${ILMBASE_VERSION}
-Libs: -L\${libdir} -lImath${ILMBASE_LIBSUFFIX} -lIexMath${ILMBASE_LIBSUFFIX} -lHalf -lIex${ILMBASE_LIBSUFFIX} -lIlmThread${ILMBASE_LIBSUFFIX} -pthread
+Libs: -L\${libdir} -lImath${ILMBASE_LIBSUFFIX} -lIexMath${ILMBASE_LIBSUFFIX} -lHalf${ILMBASE_LIBSUFFIX} -lIex${ILMBASE_LIBSUFFIX} -lIlmThread${ILMBASE_LIBSUFFIX} -pthread
 Cflags: -pthread -I\${OpenEXR_includedir}
 ")
 

diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
@@ -43,7 +43,7 @@ ADD_LIBRARY ( Half ${LIB_TYPE}
 ADD_DEPENDENCIES ( Half toFloat eLut )
 
 INSTALL ( TARGETS
-  HALF
+  Half
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
     RUNTIME DESTINATION ${RUNTIME_DIR}

diff --git a/IlmBase/HalfTest/CMakeLists.txt b/IlmBase/HalfTest/CMakeLists.txt
@@ -13,9 +13,4 @@ ADD_EXECUTABLE ( HalfTest
 
 TARGET_LINK_LIBRARIES ( HalfTest Half )
 
-INSTALL ( TARGETS
-  HalfTest
-    RUNTIME DESTINATION bin
-)
-
-ADD_TEST ( TestHalf  HalfTest )
+ADD_TEST ( TestHalf HalfTest )
diff --git a/IlmBase/IexTest/CMakeLists.txt b/IlmBase/IexTest/CMakeLists.txt
@@ -12,4 +12,4 @@ INSTALL ( TARGETS
     RUNTIME DESTINATION bin
 )
 
-ADD_TEST ( TestIex   IexTest )
+ADD_TEST ( TestIex IexTest )
diff --git a/IlmBase/ImathTest/CMakeLists.txt b/IlmBase/ImathTest/CMakeLists.txt
@@ -26,12 +26,6 @@ ADD_EXECUTABLE ( ImathTest
   testVec.cpp
   )
 
-INSTALL ( TARGETS
-  ImathTest
-    RUNTIME DESTINATION bin
-)
-
-
 ADD_TEST ( TestImath ImathTest )
 TARGET_LINK_LIBRARIES ( ImathTest Imath Iex )
 
diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
@@ -13,7 +13,7 @@ ADD_EXECUTABLE ( b44ExpLogTable
 )
 
 TARGET_LINK_LIBRARIES ( b44ExpLogTable
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
@@ -29,18 +29,16 @@ ADD_CUSTOM_COMMAND (
 ADD_EXECUTABLE ( dwaLookups
   dwaLookups.cpp
 )
-message(STATUS "Using IlmBase version ${ILMBASE_LIBSUFFIX}")
 
 TARGET_LINK_LIBRARIES ( dwaLookups
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
 )
 
 ADD_CUSTOM_COMMAND (
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dwaLookups.h
-  COMMAND echo "${RUNTIME_DIR}"
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/dwaLookups > ${CMAKE_CURRENT_BINARY_DIR}/dwaLookups.h
   DEPENDS dwaLookups
   WORKING_DIRECTORY ${RUNTIME_DIR}
@@ -147,7 +145,7 @@ ADD_LIBRARY ( IlmImf ${LIB_TYPE}
 )
 
 TARGET_LINK_LIBRARIES ( IlmImf 
-  Half 
+  Half${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
   Imath${ILMBASE_LIBSUFFIX}
   IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/IlmImfExamples/CMakeLists.txt b/OpenEXR/IlmImfExamples/CMakeLists.txt
@@ -14,7 +14,7 @@ ADD_EXECUTABLE ( IlmImfExamples
 
 TARGET_LINK_LIBRARIES ( IlmImfExamples 
         IlmImf
-        Half 
+        Half${ILMBASE_LIBSUFFIX}
         Iex${ILMBASE_LIBSUFFIX}
         Imath${ILMBASE_LIBSUFFIX}
         IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/IlmImfFuzzTest/CMakeLists.txt b/OpenEXR/IlmImfFuzzTest/CMakeLists.txt
@@ -11,7 +11,7 @@ ADD_EXECUTABLE ( IlmImfFuzzTest
 
 TARGET_LINK_LIBRARIES ( IlmImfFuzzTest 
         IlmImf
-        Half
+        Half${ILMBASE_LIBSUFFIX}
         Iex${ILMBASE_LIBSUFFIX}
         Imath${ILMBASE_LIBSUFFIX}
         IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/IlmImfTest/CMakeLists.txt b/OpenEXR/IlmImfTest/CMakeLists.txt
@@ -66,7 +66,7 @@ ADD_EXECUTABLE ( IlmImfTest
 ADD_TEST ( TestIlmImf IlmImfTest )
 TARGET_LINK_LIBRARIES ( IlmImfTest 
         IlmImf  
-        Half 
+        Half${ILMBASE_LIBSUFFIX}
         Iex${ILMBASE_LIBSUFFIX}
         Imath${ILMBASE_LIBSUFFIX}
         IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/IlmImfUtil/CMakeLists.txt b/OpenEXR/IlmImfUtil/CMakeLists.txt
@@ -27,7 +27,7 @@ ADD_LIBRARY ( IlmImfUtil ${LIB_TYPE}
 )
 
 TARGET_LINK_LIBRARIES ( IlmImfUtil 
-  Half 
+  Half${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
   Imath${ILMBASE_LIBSUFFIX}
   IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/IlmImfUtilTest/CMakeLists.txt b/OpenEXR/IlmImfUtilTest/CMakeLists.txt
@@ -16,7 +16,7 @@ ADD_TEST ( TestIlmImfUtil IlmImfUtilTest )
 TARGET_LINK_LIBRARIES ( IlmImfUtilTest 
         IlmImfUtil
         IlmImf  
-        Half 
+        Half${ILMBASE_LIBSUFFIX}
         Iex${ILMBASE_LIBSUFFIX}
         Imath${ILMBASE_LIBSUFFIX}
         IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/exr2aces/CMakeLists.txt b/OpenEXR/exr2aces/CMakeLists.txt
@@ -8,7 +8,7 @@ TARGET_LINK_LIBRARIES ( exr2aces
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrbuild/CMakeLists.txt b/OpenEXR/exrbuild/CMakeLists.txt
@@ -8,7 +8,7 @@ TARGET_LINK_LIBRARIES ( exrbuild
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrenvmap/CMakeLists.txt b/OpenEXR/exrenvmap/CMakeLists.txt
@@ -14,7 +14,7 @@ TARGET_LINK_LIBRARIES ( exrenvmap
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrheader/CMakeLists.txt b/OpenEXR/exrheader/CMakeLists.txt
@@ -8,7 +8,7 @@ TARGET_LINK_LIBRARIES ( exrheader
   IlmImf
   Iex${ILMBASE_LIBSUFFIX}
   IlmThread${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmakepreview/CMakeLists.txt b/OpenEXR/exrmakepreview/CMakeLists.txt
@@ -9,7 +9,7 @@ TARGET_LINK_LIBRARIES ( exrmakepreview
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmaketiled/CMakeLists.txt b/OpenEXR/exrmaketiled/CMakeLists.txt
@@ -10,7 +10,7 @@ TARGET_LINK_LIBRARIES ( exrmaketiled
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmultipart/CMakeLists.txt b/OpenEXR/exrmultipart/CMakeLists.txt
@@ -8,7 +8,7 @@ TARGET_LINK_LIBRARIES ( exrmultipart
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmultiview/CMakeLists.txt b/OpenEXR/exrmultiview/CMakeLists.txt
@@ -8,7 +8,7 @@ ADD_EXECUTABLE ( exrmultiview
 
 TARGET_LINK_LIBRARIES ( exrmultiview
   IlmImf
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   Imath${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
   IlmThread${ILMBASE_LIBSUFFIX}

diff --git a/OpenEXR/exrstdattr/CMakeLists.txt b/OpenEXR/exrstdattr/CMakeLists.txt
@@ -8,7 +8,7 @@ TARGET_LINK_LIBRARIES ( exrstdattr
   IlmImf
   IlmThread${ILMBASE_LIBSUFFIX}
   Iex${ILMBASE_LIBSUFFIX}
-  Half
+  Half${ILMBASE_LIBSUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR_Viewers/exrdisplay/CMakeLists.txt b/OpenEXR_Viewers/exrdisplay/CMakeLists.txt
@@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES (
 TARGET_LINK_LIBRARIES ( exrdisplay
 	IlmImf${OPENEXR_LIBSUFFIX}
 	Iex${ILMBASE_LIBSUFFIX}
-	Half
+	Half${ILMBASE_LIBSUFFIX}
 	${FLTK_LIBRARIES}
 	${OPENGL_LIBRARIES}
 )

diff --git a/OpenEXR_Viewers/playexr/CMakeLists.txt b/OpenEXR_Viewers/playexr/CMakeLists.txt
@@ -25,7 +25,7 @@ TARGET_LINK_LIBRARIES ( playexr
 	IlmImf${OPENEXR_LIBSUFFIX}
 	Iex${ILMBASE_LIBSUFFIX}
 	IlmThread${ILMBASE_LIBSUFFIX}
-	Half
+	Half${ILMBASE_LIBSUFFIX}
 	${CG_LIBRARY}
 	${CG_GL_LIBRARY}
 	${OPENGL_LIBRARIES}