add suffix variable for target names to enable static-only build

AcademySoftwareFoundation · Aug 8, 2018 · 7b1ed10 · 7b1ed10
1 parent bd32e84
commit 7b1ed10
Show file tree

Hide file tree

Showing 21 changed files with 91 additions and 94 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,6 +50,10 @@ else()
     set(BUILD_ILMBASE_STATIC OFF)
 endif()
 
+if (NOT OPENEXR_BUILD_SHARED)
+  set(OPENEXR_TARGET_SUFFIX _static)
+endif()
+
 # Testing
 set(ENABLE_TESTS ${OPENEXR_BUILD_TESTS})
 if(ENABLE_TESTS)

diff --git a/IlmBase/HalfTest/CMakeLists.txt b/IlmBase/HalfTest/CMakeLists.txt
@@ -11,6 +11,6 @@ ADD_EXECUTABLE ( HalfTest
   testSize.cpp
   )
 
-TARGET_LINK_LIBRARIES ( HalfTest IlmBase::Half )
+TARGET_LINK_LIBRARIES ( HalfTest IlmBase::Half${OPENEXR_TARGET_SUFFIX} )
 
 ADD_TEST ( TestHalf HalfTest )
diff --git a/IlmBase/IexTest/CMakeLists.txt b/IlmBase/IexTest/CMakeLists.txt
@@ -5,11 +5,6 @@ ADD_EXECUTABLE ( IexTest
   testBaseExc.cpp
   )
 
-TARGET_LINK_LIBRARIES ( IexTest IlmBase::Iex )
-
-INSTALL ( TARGETS
-  IexTest
-    RUNTIME DESTINATION bin
-)
+TARGET_LINK_LIBRARIES ( IexTest IlmBase::Iex${OPENEXR_TARGET_SUFFIX} )
 
 ADD_TEST ( TestIex IexTest )
diff --git a/IlmBase/ImathTest/CMakeLists.txt b/IlmBase/ImathTest/CMakeLists.txt
@@ -27,5 +27,9 @@ ADD_EXECUTABLE ( ImathTest
   )
 
 ADD_TEST ( TestImath ImathTest )
-TARGET_LINK_LIBRARIES ( ImathTest IlmBase::Imath IlmBase::Iex )
+
+TARGET_LINK_LIBRARIES ( ImathTest
+  IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  )
 
diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
@@ -22,9 +22,9 @@ IF (WIN32)
     IlmBase::Iex_static)
 ELSE()
   TARGET_LINK_LIBRARIES ( b44ExpLogTable
-    IlmBase::Half
-    IlmBase::IlmThread
-    IlmBase::Iex
+    IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+    IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+    IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
     ${PTHREAD_LIB})
 ENDIF()
 
@@ -51,9 +51,9 @@ IF (WIN32)
     IlmBase::Iex_static)
 ELSE()
   TARGET_LINK_LIBRARIES ( dwaLookups
-    IlmBase::Half
-    IlmBase::IlmThread
-    IlmBase::Iex
+    IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+    IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+    IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
     ${PTHREAD_LIB})
 ENDIF()
 

diff --git a/OpenEXR/IlmImfExamples/CMakeLists.txt b/OpenEXR/IlmImfExamples/CMakeLists.txt
@@ -11,13 +11,13 @@ ADD_EXECUTABLE ( IlmImfExamples
   rgbaInterfaceTiledExamples.cpp
  )
 
- SET_ILMBASE_INCLUDE_DIRS( IlmImfExamples )
+SET_ILMBASE_INCLUDE_DIRS( IlmImfExamples )
 
 TARGET_LINK_LIBRARIES ( IlmImfExamples
-  OpenEXR::IlmImf
-  IlmBase::Half
-  IlmBase::Iex
-  IlmBase::Imath
-  IlmBase::IlmThread
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
-)
+  )
diff --git a/OpenEXR/IlmImfFuzzTest/CMakeLists.txt b/OpenEXR/IlmImfFuzzTest/CMakeLists.txt
@@ -12,11 +12,11 @@ ADD_EXECUTABLE ( IlmImfFuzzTest
 SET_ILMBASE_INCLUDE_DIRS( IlmImfFuzzTest )
 
 TARGET_LINK_LIBRARIES ( IlmImfFuzzTest
-        OpenEXR::IlmImf
-        IlmBase::Half
-        IlmBase::Iex
-        IlmBase::Imath
-        IlmBase::IlmThread
-        ${PTHREAD_LIB} ${ZLIB_LIBRARIES})
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  ${PTHREAD_LIB} ${ZLIB_LIBRARIES})
 
 ADD_TEST ( TestIlmImfFuzz IlmImfFuzzTest )
diff --git a/OpenEXR/IlmImfTest/CMakeLists.txt b/OpenEXR/IlmImfTest/CMakeLists.txt
@@ -66,11 +66,10 @@ ADD_EXECUTABLE ( IlmImfTest
 
 ADD_TEST ( TestIlmImf IlmImfTest )
 TARGET_LINK_LIBRARIES ( IlmImfTest
-        OpenEXR::IlmImf
-        IlmBase::Half
-        IlmBase::Iex
-        IlmBase::Imath
-        IlmBase::IlmThread
-        ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
-        )
-
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
+  )
diff --git a/OpenEXR/IlmImfUtilTest/CMakeLists.txt b/OpenEXR/IlmImfUtilTest/CMakeLists.txt
@@ -15,12 +15,11 @@ ADD_EXECUTABLE ( IlmImfUtilTest
 
 ADD_TEST ( TestIlmImfUtil IlmImfUtilTest )
 TARGET_LINK_LIBRARIES ( IlmImfUtilTest
-        OpenEXR::IlmImfUtil
-        OpenEXR::IlmImf
-        IlmBase::Half
-        IlmBase::Iex
-        IlmBase::Imath
-        IlmBase::IlmThread
-        ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
-        )
-
+  OpenEXR::IlmImfUtil${OPENEXR_TARGET_SUFFIX}
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
+  )
diff --git a/OpenEXR/exrenvmap/CMakeLists.txt b/OpenEXR/exrenvmap/CMakeLists.txt
@@ -13,10 +13,10 @@ ADD_EXECUTABLE ( exrenvmap
 SET_ILMBASE_INCLUDE_DIRS( exrenvmap )
 
 TARGET_LINK_LIBRARIES ( exrenvmap
-  OpenEXR::IlmImf
-  IlmBase::IlmThread
-  IlmBase::Iex
-  IlmBase::Half
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrheader/CMakeLists.txt b/OpenEXR/exrheader/CMakeLists.txt
@@ -4,13 +4,13 @@ ADD_EXECUTABLE ( exrheader main.cpp )
 SET_ILMBASE_INCLUDE_DIRS( exrheader )
 
 TARGET_LINK_LIBRARIES ( exrheader
-  OpenEXR::IlmImf
-  IlmBase::Iex
-  IlmBase::IlmThread
-  IlmBase::Half
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
-)
+  )
 
 INSTALL ( TARGETS
   exrheader

diff --git a/OpenEXR/exrmakepreview/CMakeLists.txt b/OpenEXR/exrmakepreview/CMakeLists.txt
@@ -8,10 +8,10 @@ SET_ILMBASE_INCLUDE_DIRS( exrmakepreview )
 
 
 TARGET_LINK_LIBRARIES ( exrmakepreview
-  OpenEXR::IlmImf
-  IlmBase::IlmThread
-  IlmBase::Iex
-  IlmBase::Half
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmaketiled/CMakeLists.txt b/OpenEXR/exrmaketiled/CMakeLists.txt
@@ -8,10 +8,10 @@ ADD_EXECUTABLE ( exrmaketiled
 SET_ILMBASE_INCLUDE_DIRS( exrmaketiled )
 
 TARGET_LINK_LIBRARIES ( exrmaketiled
-  OpenEXR::IlmImf
-  IlmBase::IlmThread
-  IlmBase::Iex
-  IlmBase::Half
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmultipart/CMakeLists.txt b/OpenEXR/exrmultipart/CMakeLists.txt
@@ -4,10 +4,10 @@ ADD_EXECUTABLE ( exrmultipart exrmultipart.cpp )
 SET_ILMBASE_INCLUDE_DIRS( exrmultipart )
 
 TARGET_LINK_LIBRARIES ( exrmultipart
-  OpenEXR::IlmImf
-  IlmBase::IlmThread
-  IlmBase::Iex
-  IlmBase::Half
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrmultiview/CMakeLists.txt b/OpenEXR/exrmultiview/CMakeLists.txt
@@ -9,11 +9,11 @@ ADD_EXECUTABLE ( exrmultiview
 SET_ILMBASE_INCLUDE_DIRS( exrmultiview )
 
 TARGET_LINK_LIBRARIES ( exrmultiview
-  OpenEXR::IlmImf
-  IlmBase::Half
-  IlmBase::Imath
-  IlmBase::Iex
-  IlmBase::IlmThread
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR/exrstdattr/CMakeLists.txt b/OpenEXR/exrstdattr/CMakeLists.txt
@@ -4,10 +4,10 @@ ADD_EXECUTABLE ( exrstdattr main.cpp )
 SET_ILMBASE_INCLUDE_DIRS( exrstdattr )
 
 TARGET_LINK_LIBRARIES ( exrstdattr
-  OpenEXR::IlmImf
-  IlmBase::IlmThread
-  IlmBase::Iex
-  IlmBase::Half
+  OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+  IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+  IlmBase::Half${OPENEXR_TARGET_SUFFIX}
   ${PTHREAD_LIB}
   ${ZLIB_LIBRARIES}
 )

diff --git a/OpenEXR_Viewers/exrdisplay/CMakeLists.txt b/OpenEXR_Viewers/exrdisplay/CMakeLists.txt
@@ -13,19 +13,15 @@ ADD_EXECUTABLE ( exrdisplay
 	GlWindow3d.cpp
 )
 
-INCLUDE_DIRECTORIES ( 
-	${FLTK_INCLUDE_DIR}
-)
-
 TARGET_INCLUDE_DIRECTORIES ( exrdisplay 
     PRIVATE
     ${CMAKE_INSTALL_PREFIX}/include/OpenEXR
   	${FLTK_INCLUDE_DIR} )
 
 TARGET_LINK_LIBRARIES ( exrdisplay
-	OpenEXR::IlmImf
-	IlmBase::Iex
-	IlmBase::Half
+	OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+	IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+	IlmBase::Half${OPENEXR_TARGET_SUFFIX}
 	${FLTK_LIBRARIES}
 	${OPENGL_LIBRARIES}
 )

diff --git a/OpenEXR_Viewers/playexr/CMakeLists.txt b/OpenEXR_Viewers/playexr/CMakeLists.txt
@@ -22,10 +22,10 @@ INCLUDE_DIRECTORIES (
 )
 
 TARGET_LINK_LIBRARIES ( playexr
-	OpenEXR::IlmImf
-	IlmBase::Iex
-	IlmBase::IlmThread
-	IlmBase::Half
+	OpenEXR::IlmImf${OPENEXR_TARGET_SUFFIX}
+	IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
+	IlmBase::IlmThread${OPENEXR_TARGET_SUFFIX}
+	IlmBase::Half${OPENEXR_TARGET_SUFFIX}
 	${CG_LIBRARY}
 	${CG_GL_LIBRARY}
 	${OPENGL_LIBRARIES}

diff --git a/PyIlmBase/PyIex/CMakeLists.txt b/PyIlmBase/PyIex/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF()
 SET_ILMBASE_INCLUDE_DIRS( PyIex )
 
 TARGET_LINK_LIBRARIES ( PyIex
-	PUBLIC  IlmBase::Iex
+	PUBLIC  IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
 	PRIVATE ${PYTHON_LIBRARIES}
 	PRIVATE ${Boost_LIBRARIES}
 )
@@ -49,9 +49,9 @@ else()
 	)
 endif()
 
+#    IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
 TARGET_LINK_LIBRARIES ( iexmodule
 	PyIex
-    IlmBase::Iex
 	${PYTHON_LIBRARIES}
 	${Boost_LIBRARIES}
 )

diff --git a/PyIlmBase/PyImath/CMakeLists.txt b/PyIlmBase/PyImath/CMakeLists.txt
@@ -43,10 +43,10 @@ ENDIF()
 
 SET_ILMBASE_INCLUDE_DIRS( PyImath )
 
+#    IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
 TARGET_LINK_LIBRARIES ( PyImath
-    IlmBase::Iex
-    IlmBase::IexMath
-    IlmBase::Imath
+    IlmBase::IexMath${OPENEXR_TARGET_SUFFIX}
+    IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
     PyIex
 	${Boost_LIBRARIES}
 	${PYTHON_LIBRARIES}
@@ -83,11 +83,11 @@ endif()
 
 SET_ILMBASE_INCLUDE_DIRS( imathmodule )
 
+#	IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+#	IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
 TARGET_LINK_LIBRARIES ( imathmodule
 	PyImath
 	PyIex
-	IlmBase::Imath
-	IlmBase::Iex
 	${Boost_LIBRARIES}
 	${PYTHON_LIBRARIES}
 )

diff --git a/PyIlmBase/PyImathNumpy/CMakeLists.txt b/PyIlmBase/PyImathNumpy/CMakeLists.txt
@@ -21,11 +21,11 @@ INCLUDE_DIRECTORIES (
 )
 SET_ILMBASE_INCLUDE_DIRS( imathnumpymodule )
 
+#	IlmBase::Imath${OPENEXR_TARGET_SUFFIX}
+#	IlmBase::Iex${OPENEXR_TARGET_SUFFIX}
 TARGET_LINK_LIBRARIES ( imathnumpymodule
 	PyImath
 	PyIex
-	IlmBase::Imath
-	IlmBase::Iex
 	${Boost_LIBRARIES}
 )