Fixes for the C++ exports

Signed-off-by: Darby Johnston <[email protected]>

Author: darbyjohnston

CMakeLists.txt

@@ -36,6 +36,13 @@ option(OTIO_FIND_RAPIDJSON            "Find RapidJSON using find_package" OFF)
 set(OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)")
 
 # Build options
+#
+# If you are building OpenTimelineIO as a static library you will need to
+# defined OPENTIME_STATIC and OTIO_STATIC. If you use the provided CMake
+# config files these will be automatically defined for you. To use the
+# provided config files add `find_package(OpenTimelineIO)` to your
+# CMakeLists.txt file.
+#
 option(OTIO_SHARED_LIBS          "Build shared if ON, static if OFF" ON)
 option(OTIO_CXX_COVERAGE         "Invoke code coverage if lcov/gcov is available" OFF)
 option(OTIO_CXX_EXAMPLES         "Build CXX examples (also requires OTIO_PYTHON_INSTALL=ON)" OFF)

src/opentime/CMakeLists.txt

@@ -28,7 +28,7 @@ set_target_properties(opentime PROPERTIES
     LIBRARY_OUTPUT_NAME "opentime"
     POSITION_INDEPENDENT_CODE TRUE)
 
-if(BUILD_SHARED_LIBS)
+if(OTIO_SHARED_LIBS)
     set_target_properties(opentime PROPERTIES
         SOVERSION ${OTIO_SOVERSION}
         VERSION ${OTIO_VERSION})

src/opentime/export.h

@@ -11,11 +11,13 @@
 #       define OPENTIMELINIO_IMPORT __attribute__((dllimport))
 #       define OPENTIMELINIO_HIDDEN
 #       define OPENTIMELINIO_EXPORT_TYPE
+#       define OPENTIMELINIO_IMPORT_TYPE
 #   else
 #       define OPENTIMELINIO_EXPORT __declspec(dllexport)
 #       define OPENTIMELINIO_IMPORT __declspec(dllimport)
 #       define OPENTIMELINIO_HIDDEN
 #       define OPENTIMELINIO_EXPORT_TYPE
+#       define OPENTIMELINIO_IMPORT_TYPE
 #   endif
 #elif defined(__GNUC__) && __GNUC__ >= 4 || defined(__clang__)
 #   define OPENTIMELINIO_EXPORT __attribute__((visibility("default")))
@@ -26,11 +28,13 @@
 #   else
 #       define OPENTIMELINIO_EXPORT_TYPE __attribute__((visibility("default")))
 #   endif
+#   define OPENTIMELINIO_IMPORT_TYPE
 #else
 #   define OPENTIMELINIO_EXPORT
 #   define OPENTIMELINIO_IMPORT
 #   define OPENTIMELINIO_HIDDEN
 #   define OPENTIMELINIO_EXPORT_TYPE
+#   define OPENTIMELINIO_IMPORT_TYPE
 #endif
 #define OPENTIMELINIO_EXPORT_TEMPLATE(type, ...)
 #define OPENTIMELINIO_IMPORT_TEMPLATE(type, ...) \

src/opentimelineio/CMakeLists.txt

@@ -103,7 +103,7 @@ set_target_properties(opentimelineio PROPERTIES
     LIBRARY_OUTPUT_NAME "opentimelineio"
     POSITION_INDEPENDENT_CODE TRUE)
 
-if(BUILD_SHARED_LIBS)
+if(OTIO_SHARED_LIBS)
     set_target_properties(opentimelineio PROPERTIES
         SOVERSION ${OTIO_SOVERSION}
         VERSION ${OTIO_VERSION})