Incorporate review feedback

AcademySoftwareFoundation · Aug 8, 2018 · 8306c3c · 8306c3c
1 parent 7d66fd2
commit 8306c3c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 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/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 )