Cmake now building OpenEXR successfully for Windows

AcademySoftwareFoundation · Aug 8, 2018 · ac055a9 · ac055a9
1 parent 965c1eb
commit ac055a9
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 48 deletions.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -103,6 +103,11 @@ IF (BUILD_SHARED_LIBS)
   ENDIF ()
 ENDIF (BUILD_SHARED_LIBS)
 
+IF (WIN32)
+  SET (RUNTIME_DIR bin)
+ELSE ()
+  SET (RUNTIME_DIR lib)
+ENDIF ()
 
 ADD_SUBDIRECTORY ( Half )
 ADD_SUBDIRECTORY ( Iex )
@@ -158,35 +163,26 @@ IF (NAMESPACE_VERSIONING)
   SET ( ILMBASE_LIBSUFFIX "-${ILMBASE_VERSION_API}" )
 ENDIF ()
 
-SET_TARGET_PROPERTIES ( Half
-  PROPERTIES
-  VERSION 12.0.0
-  SOVERSION 12
-  )
-SET_TARGET_PROPERTIES ( Iex
-  PROPERTIES
-  VERSION 12.0.0
-  SOVERSION 12
-  OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}"
-  )
-SET_TARGET_PROPERTIES ( Imath
-  PROPERTIES
-  VERSION 12.0.0
-  SOVERSION 12
-  OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}"
-  )
-SET_TARGET_PROPERTIES ( IlmThread
-  PROPERTIES
-  VERSION 12.0.0
-  SOVERSION 12
-  OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}"
-  )
-SET_TARGET_PROPERTIES ( IexMath
-  PROPERTIES
-  VERSION 12.0.0
-  SOVERSION 12
-  OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}"
-  )
+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}"
+    )
+ENDFOREACH()
 
 IF ( NOT WIN32 )
   CREATE_LIBTOOL_FILE ( Half /lib )
@@ -196,6 +192,7 @@ IF ( NOT WIN32 )
   CREATE_LIBTOOL_FILE ( IlmThread /lib )
 ENDIF ()
 
+
 # Tests
 
 ADD_SUBDIRECTORY ( HalfTest )
@@ -208,7 +205,6 @@ INSTALL ( FILES
   ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h
   DESTINATION
   include/OpenEXR
-
 )
 
 FILE ( WRITE ${CMAKE_BINARY_DIR}/IlmBase.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" )
@@ -229,3 +225,4 @@ INSTALL ( FILES
   DESTINATION
   lib/pkgconfig
 )
+
diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
@@ -43,9 +43,10 @@ ADD_LIBRARY ( Half ${LIB_TYPE}
 ADD_DEPENDENCIES ( Half toFloat eLut )
 
 INSTALL ( TARGETS
-  Half
-  DESTINATION
-  lib
+  HALF
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
 INSTALL ( FILES 

diff --git a/IlmBase/HalfTest/CMakeLists.txt b/IlmBase/HalfTest/CMakeLists.txt
@@ -13,4 +13,9 @@ ADD_EXECUTABLE ( HalfTest
 
 TARGET_LINK_LIBRARIES ( HalfTest Half )
 
+INSTALL ( TARGETS
+  HalfTest
+    RUNTIME DESTINATION bin
+)
+
 ADD_TEST ( TestHalf  HalfTest )
diff --git a/IlmBase/Iex/CMakeLists.txt b/IlmBase/Iex/CMakeLists.txt
@@ -9,11 +9,11 @@ ADD_LIBRARY ( Iex ${LIB_TYPE}
   IexThrowErrnoExc.cpp
   )
 
-
 INSTALL ( TARGETS
   Iex
-  DESTINATION
-  lib
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
 INSTALL ( FILES 

diff --git a/IlmBase/IexMath/CMakeLists.txt b/IlmBase/IexMath/CMakeLists.txt
@@ -11,8 +11,9 @@ TARGET_LINK_LIBRARIES(IexMath Iex)
 
 INSTALL ( TARGETS
   IexMath
-  DESTINATION
-  lib
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
 INSTALL ( FILES 

diff --git a/IlmBase/IexTest/CMakeLists.txt b/IlmBase/IexTest/CMakeLists.txt
@@ -7,4 +7,9 @@ ADD_EXECUTABLE ( IexTest
 
 TARGET_LINK_LIBRARIES ( IexTest Iex )
 
+INSTALL ( TARGETS
+  IexTest
+    RUNTIME DESTINATION bin
+)
+
 ADD_TEST ( TestIex   IexTest )
diff --git a/IlmBase/IlmThread/CMakeLists.txt b/IlmBase/IlmThread/CMakeLists.txt
@@ -30,8 +30,9 @@ TARGET_LINK_LIBRARIES(IlmThread Iex)
 
 INSTALL ( TARGETS
   IlmThread
-  DESTINATION
-  lib
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
 INSTALL ( FILES 

diff --git a/IlmBase/Imath/CMakeLists.txt b/IlmBase/Imath/CMakeLists.txt
@@ -18,10 +18,12 @@ TARGET_LINK_LIBRARIES(Imath Iex)
 
 INSTALL ( TARGETS
   Imath
-  DESTINATION
-  lib
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
+
 INSTALL ( FILES 
   ImathBoxAlgo.h
   ImathBox.h

diff --git a/IlmBase/ImathTest/CMakeLists.txt b/IlmBase/ImathTest/CMakeLists.txt
@@ -26,6 +26,12 @@ 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/CMakeLists.txt b/OpenEXR/CMakeLists.txt
@@ -39,6 +39,12 @@ SET (BUILD_WITH_INSTALL_RPATH 1)
 
 ADD_DEFINITIONS ( -DHAVE_CONFIG_H -DILM_IMF_TEST_IMAGEDIR="${CMAKE_SOURCE_DIR}/IlmImfTest/" )
 
+IF (WIN32)
+  SET (RUNTIME_DIR bin)
+ELSE ()
+  SET (RUNTIME_DIR lib)
+ENDIF ()
+
 INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_BINARY_DIR}/config
   IlmImf

diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
@@ -2,6 +2,12 @@
 
 SET(CMAKE_INCLUDE_CURRENT_DIR 1)
 
+IF (WIN32)
+  SET(RUNTIME_DIR ${ILMBASE_PACKAGE_PREFIX}/bin)
+ELSE ()
+  SET(RUNTIME_DIR ${ILMBASE_PACKAGE_PREFIX}/lib)
+ENDIF ()
+
 ADD_EXECUTABLE ( b44ExpLogTable
   b44ExpLogTable.cpp
 )
@@ -17,7 +23,7 @@ ADD_CUSTOM_COMMAND (
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/b44ExpLogTable > ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h
   DEPENDS b44ExpLogTable
-  WORKING_DIRECTORY ${ILMBASE_PACKAGE_PREFIX}/lib
+  WORKING_DIRECTORY ${RUNTIME_DIR}
 )
 
 ADD_EXECUTABLE ( dwaLookups
@@ -34,9 +40,10 @@ 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 ${ILMBASE_PACKAGE_PREFIX}/lib
+  WORKING_DIRECTORY ${RUNTIME_DIR}
 )
 
 SET ( ILMIMF_SRCS
@@ -169,10 +176,12 @@ SET_SOURCE_FILES_PROPERTIES (
 
 INSTALL ( TARGETS
   IlmImf
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/lib
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
+
 # Headers
 INSTALL ( FILES
   ImfForward.h

diff --git a/OpenEXR/IlmImfUtil/CMakeLists.txt b/OpenEXR/IlmImfUtil/CMakeLists.txt
@@ -40,8 +40,9 @@ TARGET_LINK_LIBRARIES ( IlmImfUtil
 
 INSTALL ( TARGETS
   IlmImfUtil
-  DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/lib
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION ${RUNTIME_DIR}
 )
 
 # Headers