Revision: 75931
http://sourceforge.net/p/brlcad/code/75931
Author: starseeker
Date: 2020-05-26 00:09:53 +0000 (Tue, 26 May 2020)
Log Message:
-----------
Directly check the targets here, since the library variables might conceivably
hold more than one target for linking purposes.
Modified Paths:
--------------
brlcad/trunk/src/libbg/CMakeLists.txt
brlcad/trunk/src/libicv/CMakeLists.txt
brlcad/trunk/src/librt/CMakeLists.txt
Modified: brlcad/trunk/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbg/CMakeLists.txt 2020-05-26 00:02:58 UTC (rev
75930)
+++ brlcad/trunk/src/libbg/CMakeLists.txt 2020-05-26 00:09:53 UTC (rev
75931)
@@ -34,14 +34,14 @@
set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
- if (TARGET ${P2T_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
- endif (TARGET ${P2T_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
if (TARGET libbg-obj)
set_property(TARGET libbg-obj APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
- if (TARGET ${P2T_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET libbg-obj APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
- endif (TARGET ${P2T_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
endif (TARGET libbg-obj)
endif (HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/trunk/src/libicv/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libicv/CMakeLists.txt 2020-05-26 00:02:58 UTC (rev
75930)
+++ brlcad/trunk/src/libicv/CMakeLists.txt 2020-05-26 00:09:53 UTC (rev
75931)
@@ -27,13 +27,13 @@
BRLCAD_ADDLIB(libicv "${LIBICV_SOURCES}"
"libbu;libbn;${PNG_LIBRARIES};${NETPBM_LIBRARY}")
set_target_properties(libicv PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (HIDE_INTERNAL_SYMBOLS)
- if (TARGET ${NETPBM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET libicv APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_IMPORTS")
- endif (TARGET ${NETPBM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
if (TARGET libicv-obj)
- if (TARGET ${NETPBM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET libicv-obj APPEND PROPERTY COMPILE_DEFINITIONS
"NETPBM_DLL_IMPORTS")
- endif (TARGET ${NETPBM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
endif (TARGET libicv-obj)
endif (HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2020-05-26 00:02:58 UTC (rev
75930)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2020-05-26 00:09:53 UTC (rev
75931)
@@ -367,27 +367,27 @@
if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
- if(TARGET ${VDS_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
- endif(TARGET ${VDS_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
- if(TARGET ${GDIAM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- endif(TARGET ${GDIAM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
- if(TARGET ${LZ4_LIBRARIES} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
- endif(TARGET ${LZ4_LIBRARIES} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
if (TARGET librt-obj)
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
- if(TARGET ${VDS_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
- endif(TARGET ${VDS_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
- if(TARGET ${GDIAM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- endif(TARGET ${GDIAM_LIBRARY} OR HIDE_INTERNAL_SYMBOLS_EXT)
- if(TARGET ${LZ4_LIBRARIES} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
+ if(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
- endif(TARGET ${LZ4_LIBRARIES} OR HIDE_INTERNAL_SYMBOLS_EXT)
+ endif(TARGET lz4 OR HIDE_INTERNAL_SYMBOLS_EXT)
endif (TARGET librt-obj)
endif(HIDE_INTERNAL_SYMBOLS)
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
