Revision: 55551
http://sourceforge.net/p/brlcad/code/55551
Author: d_rossberg
Date: 2013-05-23 11:49:58 +0000 (Thu, 23 May 2013)
Log Message:
-----------
link openNURBS statically in brlcad.dll
doing so some of the Windows-DLL-import/export-flag logic can be simplified
Modified Paths:
--------------
brlcad/trunk/misc/win32-msvc/Dll/CMakeLists.txt
brlcad/trunk/src/libbrep/CMakeLists.txt
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/libwdb/CMakeLists.txt
brlcad/trunk/src/other/openNURBS/CMakeLists.txt
Modified: brlcad/trunk/misc/win32-msvc/Dll/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/win32-msvc/Dll/CMakeLists.txt 2013-05-23 11:29:36 UTC
(rev 55550)
+++ brlcad/trunk/misc/win32-msvc/Dll/CMakeLists.txt 2013-05-23 11:49:58 UTC
(rev 55551)
@@ -47,7 +47,7 @@
libwdb-static
p2t_static
zlib-static
- openNURBS
+ openNURBS-static
tcl85
)
@@ -114,7 +114,7 @@
libwdb-static
p2t_static
zlib-static
- openNURBS
+ openNURBS-static
Ws2_32
Psapi
)
Modified: brlcad/trunk/src/libbrep/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbrep/CMakeLists.txt 2013-05-23 11:29:36 UTC (rev
55550)
+++ brlcad/trunk/src/libbrep/CMakeLists.txt 2013-05-23 11:49:58 UTC (rev
55551)
@@ -43,22 +43,14 @@
get_property(libbrep_DEFINES GLOBAL PROPERTY libbrep_DEFINES)
list(APPEND libbrep_DEFINES "OBJ_BREP=1")
if(CPP_DLL_DEFINES)
- list(APPEND libbrep_DEFINES "ON_DLL_IMPORTS")
+ list(APPEND libbrep_DLL_DEFINES "ON_DLL_IMPORTS")
+ set_property(GLOBAL PROPERTY libbrep_DLL_DEFINES "${libbrep_DLL_DEFINES}")
endif(CPP_DLL_DEFINES)
set_property(GLOBAL PROPERTY libbrep_DEFINES "${libbrep_DEFINES}")
BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbn;libbu;${OPENNURBS_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
-if(BUILD_STATIC_LIBS)
- set_property(TARGET libbrep-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
-endif(BUILD_STATIC_LIBS)
-
set_target_properties(libbrep PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(CPP_DLL_DEFINES)
- if(BRLCAD_BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
- SET_PROPERTY(TARGET libbrep-static APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
- endif(BRLCAD_BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
-endif(CPP_DLL_DEFINES)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2013-05-23 11:29:36 UTC (rev
55550)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2013-05-23 11:49:58 UTC (rev
55551)
@@ -287,19 +287,12 @@
endif(MSVC)
BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${LIBVDS_LIBRARY};libbn;libbu;${OPENNURBS_LIBRARY};${P2T_LIBRARY};libbrep;${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
-if(BUILD_STATIC_LIBS)
- SET_PROPERTY(TARGET librt-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
-endif(BUILD_STATIC_LIBS)
SET_TARGET_PROPERTIES(librt PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
SET_PROPERTY(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
-
- if(BRLCAD_BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
- SET_PROPERTY(TARGET librt-static APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
- endif(BRLCAD_BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
endif(CPP_DLL_DEFINES)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/libwdb/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libwdb/CMakeLists.txt 2013-05-23 11:29:36 UTC (rev
55550)
+++ brlcad/trunk/src/libwdb/CMakeLists.txt 2013-05-23 11:49:58 UTC (rev
55551)
@@ -41,18 +41,13 @@
get_property(libwdb_DEFINES GLOBAL PROPERTY libwdb_DEFINES)
LIST(APPEND libwdb_DEFINES "OBJ_BREP=1")
if(CPP_DLL_DEFINES)
- LIST(APPEND libwdb_DEFINES "ON_DLL_IMPORTS")
+ LIST(APPEND libwdb_DLL_DEFINES "ON_DLL_IMPORTS")
+ set_property(GLOBAL PROPERTY libwdb_DLL_DEFINES "${libwdb_DLL_DEFINES}")
endif(CPP_DLL_DEFINES)
set_property(GLOBAL PROPERTY libwdb_DEFINES "${libwdb_DEFINES}")
BRLCAD_ADDLIB(libwdb "${LIBWDB_SOURCES}"
"librt;libbn;libbu;libsysv;${OPENNURBS_LIBRARY};${REGEX_LIBRARY};${ZLIB_LIBRARY}")
set_target_properties(libwdb PROPERTIES VERSION 20.0.1 SOVERSION 20)
-if(CPP_DLL_DEFINES)
- if(BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
- SET_PROPERTY(TARGET libwdb-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
- SET_PROPERTY(TARGET libwdb-static APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
- endif(BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
-endif(CPP_DLL_DEFINES)
CMAKEFILES(Makefile.am)
Modified: brlcad/trunk/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2013-05-23 11:29:36 UTC
(rev 55550)
+++ brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2013-05-23 11:49:58 UTC
(rev 55551)
@@ -307,18 +307,17 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
ENDIF(BUILD_SHARED_LIBS)
-IF(NOT MSVC)
- IF(BUILD_STATIC_LIBS)
- add_library(openNURBS-static STATIC ${OPENNURBS_SOURCES})
- target_link_libraries(openNURBS-static ${OPENNURBS_LINKLIBRARIES})
- IF(NOT WIN32)
+
+IF(BUILD_STATIC_LIBS)
+ add_library(openNURBS-static STATIC ${OPENNURBS_SOURCES})
+ target_link_libraries(openNURBS-static ${OPENNURBS_LINKLIBRARIES})
+ IF(NOT WIN32)
SET_TARGET_PROPERTIES(openNURBS-static PROPERTIES OUTPUT_NAME
"openNURBS")
- ENDIF(NOT WIN32)
- install(TARGETS openNURBS-static
- RUNTIME DESTINATION ${BIN_DIR}
- LIBRARY DESTINATION ${LIB_DIR}
- ARCHIVE DESTINATION ${LIB_DIR})
- ENDIF(BUILD_STATIC_LIBS)
-ENDIF(NOT MSVC)
+ ENDIF(NOT WIN32)
+ install(TARGETS openNURBS-static
+ RUNTIME DESTINATION ${BIN_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ ARCHIVE DESTINATION ${LIB_DIR})
+ENDIF(BUILD_STATIC_LIBS)
install(FILES ${OPENNURBS_HEADERS} DESTINATION include/openNURBS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
