From 99b367d963ba0892e7ab830458b6a990aa3033ce Mon Sep 17 00:00:00 2001 From: Nick Porcino Date: Wed, 4 Apr 2018 23:54:20 -0700 Subject: [PATCH] Incorporate review feedback --- IlmBase/CMakeLists.txt | 15 ++------------- IlmBase/Half/CMakeLists.txt | 2 +- IlmBase/HalfTest/CMakeLists.txt | 7 +------ IlmBase/IexTest/CMakeLists.txt | 2 +- IlmBase/ImathTest/CMakeLists.txt | 6 ------ OpenEXR/IlmImf/CMakeLists.txt | 8 +++----- OpenEXR/IlmImfExamples/CMakeLists.txt | 2 +- OpenEXR/IlmImfFuzzTest/CMakeLists.txt | 2 +- OpenEXR/IlmImfTest/CMakeLists.txt | 2 +- OpenEXR/IlmImfUtil/CMakeLists.txt | 2 +- OpenEXR/IlmImfUtilTest/CMakeLists.txt | 2 +- OpenEXR/exr2aces/CMakeLists.txt | 2 +- OpenEXR/exrbuild/CMakeLists.txt | 2 +- OpenEXR/exrenvmap/CMakeLists.txt | 2 +- OpenEXR/exrheader/CMakeLists.txt | 2 +- OpenEXR/exrmakepreview/CMakeLists.txt | 2 +- OpenEXR/exrmaketiled/CMakeLists.txt | 2 +- OpenEXR/exrmultipart/CMakeLists.txt | 2 +- OpenEXR/exrmultiview/CMakeLists.txt | 2 +- OpenEXR/exrstdattr/CMakeLists.txt | 2 +- OpenEXR_Viewers/exrdisplay/CMakeLists.txt | 2 +- OpenEXR_Viewers/playexr/CMakeLists.txt | 2 +- 22 files changed, 24 insertions(+), 48 deletions(-) diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt index 911146a89b..d8c600e6ec 100644 --- 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 index b20abf6929..3c7384aebd 100644 --- 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 index 870719dfc1..2ab1eab0fc 100644 --- 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 index e699a0a130..ca714c3b74 100644 --- 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 index accf4172b5..f6469ee10e 100644 --- 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 index a3135133c9..7cf2adb942 100644 --- 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,10 +29,9 @@ 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} @@ -40,7 +39,6 @@ TARGET_LINK_LIBRARIES ( dwaLookups 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 index 03061cba7d..386f182b00 100644 --- 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 index 12fe07248b..af0c22bcae 100644 --- 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 index 42a1341b15..6c61e00b7f 100644 --- 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 index eb225ebecb..0cc2d8b21e 100644 --- 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 index 3663dc09e8..f43d2e648c 100644 --- 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 index c536629474..cbd9f2bcb1 100644 --- 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 index 03979d5223..05e265aa33 100644 --- 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 index 70ebd83a6e..42a15fee32 100644 --- 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 index 1953836930..1027e67219 100644 --- 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 index 78b92781a6..6300310b2f 100644 --- 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 index 1e8f00d625..26eb2c358c 100644 --- 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 index 4f013cde6c..04b7e23555 100644 --- 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 index 4c71437579..203ef1b80f 100644 --- 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 index f8904ddbb7..814e89402e 100644 --- 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 index bfe6d9dc1a..b009a9cdbe 100644 --- 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 index 59120bb3e7..f89bb60ac8 100644 --- 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}