Revision: 75857
http://sourceforge.net/p/brlcad/code/75857
Author: starseeker
Date: 2020-05-21 00:32:25 +0000 (Thu, 21 May 2020)
Log Message:
-----------
We're (eventually) going to need the export definition for the object target as
well as the main lib target. Not used yet, but put it in so it's ready to go
when needed.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-20 22:01:42 UTC
(rev 75856)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-21 00:32:25 UTC
(rev 75857)
@@ -464,6 +464,13 @@
add_library(${libname}-obj OBJECT ${lsrcslist})
set(lsrcslist $<TARGET_OBJECTS:${libname}-obj>)
set_target_properties(${libname}-obj PROPERTIES FOLDER "BRL-CAD OBJECT
Libraries${SUBFOLDER}")
+
+ if(CPP_DLL_DEFINES)
+ string(REPLACE "lib" "" LOWERCORE "${libname}")
+ string(TOUPPER ${LOWERCORE} UPPER_CORE)
+ set_property(TARGET ${libname}-obj APPEND PROPERTY COMPILE_DEFINITIONS
"${UPPER_CORE}_DLL_EXPORTS")
+ endif(CPP_DLL_DEFINES)
+
if(NOT "${libslist}" STREQUAL "" AND NOT "${libslist}" STREQUAL "NONE")
foreach(ll ${libslist})
if (TARGET ${ll})
@@ -471,10 +478,14 @@
endif (TARGET ${ll})
endforeach(ll ${libslist})
endif(NOT "${libslist}" STREQUAL "" AND NOT "${libslist}" STREQUAL "NONE")
+
endif(USE_OBJECT_LIBS)
+ # Handle the shared library
if(L_SHARED OR (BUILD_SHARED_LIBS AND NOT L_STATIC))
+
add_library(${libname} SHARED ${lsrcslist} ${L_SHARED_SRCS})
+
if(CPP_DLL_DEFINES)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
@@ -481,6 +492,7 @@
set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS
"${UPPER_CORE}_DLL_EXPORTS")
set_property(GLOBAL APPEND PROPERTY ${libname}_DLL_DEFINES
"${UPPER_CORE}_DLL_IMPORTS")
endif(CPP_DLL_DEFINES)
+
endif(L_SHARED OR (BUILD_SHARED_LIBS AND NOT L_STATIC))
if(L_STATIC OR (BUILD_STATIC_LIBS AND NOT L_SHARED))
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
