Commit 6135e431 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix creation of exports file on Unix

parent c9ac06b3
...@@ -76,7 +76,7 @@ MACRO(CREATE_EXPORT_FILE VAR TARGET API_FUNCTIONS) ...@@ -76,7 +76,7 @@ MACRO(CREATE_EXPORT_FILE VAR TARGET API_FUNCTIONS)
CONFIGURE_FILE_CONTENT(${CONTENT} ${EXPORTS}) CONFIGURE_FILE_CONTENT(${CONTENT} ${EXPORTS})
SET(${VAR} ${DUMMY} ${EXPORTS}) SET(${VAR} ${DUMMY} ${EXPORTS})
ELSE() ELSE()
SET(EXPORTS ${CMAKE_CURRENT_BINARY_DIR}/${target}_exports_file.cc) SET(EXPORTS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_exports_file.cc)
SET(CONTENT) SET(CONTENT)
FOREACH(FUNC ${API_FUNCTIONS}) FOREACH(FUNC ${API_FUNCTIONS})
SET(CONTENT "${CONTENT} extern void* ${FUNC}\;\n") SET(CONTENT "${CONTENT} extern void* ${FUNC}\;\n")
...@@ -241,7 +241,9 @@ MACRO(MERGE_LIBRARIES) ...@@ -241,7 +241,9 @@ MACRO(MERGE_LIBRARIES)
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
CREATE_EXPORT_FILE(SRC ${TARGET} "${EXPORTS}")
CREATE_EXPORT_FILE(SRC ${TARGET} "${ARG_EXPORTS}")
ADD_LIBRARY(${TARGET} SHARED ${SRC}) ADD_LIBRARY(${TARGET} SHARED ${SRC})
TARGET_LINK_LIBRARIES(${TARGET} ${LIBS}) TARGET_LINK_LIBRARIES(${TARGET} ${LIBS})
IF(ARG_OUTPUT_NAME) IF(ARG_OUTPUT_NAME)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment