fix names, disable rules when not building shared

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

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -133,7 +133,7 @@ FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h "
                              (ILMBASE_VERSION_PATCH <<  8))
 ")
 
-IF ( NOT WIN32 )
+IF ( NOT WIN32 AND OPENEXR_BUILD_SHARED )
   CREATE_LIBTOOL_FILE ( Half /lib )
   CREATE_LIBTOOL_FILE ( Iex /lib )
   CREATE_LIBTOOL_FILE ( IexMath /lib )

diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt
@@ -126,24 +126,28 @@ ENDIF()
 ##########################
 ADD_SUBDIRECTORY ( IlmImf )
 
-SET_TARGET_PROPERTIES ( IlmImf
-  PROPERTIES
-  VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
-  SOVERSION ${OPENEXR_VERSION_MAJOR}
-  OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}"
-  )
+IF ( OPENEXR_BUILD_SHARED )
+  SET_TARGET_PROPERTIES ( IlmImf
+    PROPERTIES
+    VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
+    SOVERSION ${OPENEXR_VERSION_MAJOR}
+    OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}"
+    )
+ENDIF ()
 
 ##########################
 # IlmImfUtil library
 ##########################
 ADD_SUBDIRECTORY ( IlmImfUtil )
 
-SET_TARGET_PROPERTIES ( IlmImfUtil
-  PROPERTIES
-  VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
-  SOVERSION ${OPENEXR_VERSION_MAJOR}
-  OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
-  )
+IF ( OPENEXR_BUILD_SHARED )
+  SET_TARGET_PROPERTIES ( IlmImfUtil
+    PROPERTIES
+    VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
+    SOVERSION ${OPENEXR_VERSION_MAJOR}
+    OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}"
+    )
+ENDIF ()
 
 ##########################
 # Example Code

diff --git a/OpenEXR/IlmImfUtil/CMakeLists.txt b/OpenEXR/IlmImfUtil/CMakeLists.txt
@@ -54,7 +54,7 @@ IF ( OPENEXR_BUILD_STATIC )
   LIST ( APPEND OPENEXR_LIB_TARGETS IlmImfUtil_static )
 
   ADD_LIBRARY ( IlmImfUtil_static STATIC ${ILMIMFUTIL_SRCS} )
-  SET_ILMBASE_INCLUDE_DIRS( IlmImf_static )
+  SET_ILMBASE_INCLUDE_DIRS( IlmImfUtil_static )
 
   SET_TARGET_PROPERTIES ( IlmImfUtil_static
     PROPERTIES