Revision: 41070
http://brlcad.svn.sourceforge.net/brlcad/?rev=41070&view=rev
Author: starseeker
Date: 2010-10-19 01:33:17 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
Don't build the static targets with MSVC.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/cmake/src/CMakeLists.txt
brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-10-19 00:15:24 UTC
(rev 41069)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-10-19 01:33:17 UTC
(rev 41070)
@@ -48,7 +48,7 @@
endif(NOT ${libs} MATCHES "NONE")
INSTALL(TARGETS ${libname} DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
ENDIF(BUILD_SHARED_LIBS)
- IF(BUILD_STATIC_LIBS)
+ IF(BUILD_STATIC_LIBS AND NOT MSVC)
add_library(${libname}-static STATIC ${srcslist})
if(NOT ${libs} MATCHES "NONE")
target_link_libraries(${libname}-static ${libslist})
@@ -61,7 +61,7 @@
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES PREFIX
"lib")
ENDIF(WIN32)
INSTALL(TARGETS ${libname}-static DESTINATION
${BRLCAD_INSTALL_LIB_DIR})
- ENDIF(BUILD_STATIC_LIBS)
+ ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
# Enable extra compiler flags if local libraries and/or global options
dictate
SET(LOCAL_COMPILE_FLAGS "")
@@ -74,9 +74,9 @@
IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(${libname} PROPERTIES COMPILE_FLAGS
${LOCAL_COMPILE_FLAGS})
ENDIF(BUILD_SHARED_LIBS)
- IF(BUILD_STATIC_LIBS)
+ IF(BUILD_STATIC_LIBS AND NOT MSVC)
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES
COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
- ENDIF(BUILD_STATIC_LIBS)
+ ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
ENDIF(LOCAL_COMPILE_FLAGS)
ENDMACRO(BRLCAD_ADDLIB libname srcs libs)
Modified: brlcad/branches/cmake/src/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/CMakeLists.txt 2010-10-19 00:15:24 UTC (rev
41069)
+++ brlcad/branches/cmake/src/CMakeLists.txt 2010-10-19 01:33:17 UTC (rev
41070)
@@ -52,6 +52,7 @@
IF(MSVC)
add_definitions(
-DBRLCAD_DLL
+ -D_CRT_SECURE_NO_WARNINGS
)
ENDIF(MSVC)
Modified: brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-10-19
00:15:24 UTC (rev 41069)
+++ brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-10-19
01:33:17 UTC (rev 41070)
@@ -22,11 +22,11 @@
add_library(regex SHARED ${LIBREGEX_SOURCES})
INSTALL(TARGETS regex DESTINATION lib)
-
+IF(NOT MSVC)
add_library(regex-static STATIC ${LIBREGEX_SOURCES})
INSTALL(TARGETS regex-static ARCHIVE DESTINATION lib)
SET_TARGET_PROPERTIES(regex-static PROPERTIES OUTPUT_NAME "regex")
-
+ENDIF(NOT MSVC)
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
install(FILES ${LIBREGEX_PUBLIC_HDRS} DESTINATION include)
endif()
Modified: brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2010-10-19
00:15:24 UTC (rev 41069)
+++ brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2010-10-19
01:33:17 UTC (rev 41070)
@@ -59,11 +59,12 @@
add_library(utahrle SHARED ${LIBUTAHRLE_SOURCES})
target_link_libraries(utahrle ${M_LIBRARY})
INSTALL(TARGETS utahrle DESTINATION lib)
-
+IF(NOT MSVC)
add_library(utahrle-static STATIC ${LIBUTAHRLE_SOURCES})
target_link_libraries(utahrle-static ${M_LIBRARY})
INSTALL(TARGETS utahrle-static ARCHIVE DESTINATION lib)
SET_TARGET_PROPERTIES(utahrle-static PROPERTIES OUTPUT_NAME "utahrle")
+ENDIF(NOT MSVC)
SET(LIBUTAHRLE_MAN3
buildmap.3
Modified: brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-10-19
00:15:24 UTC (rev 41069)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-10-19
01:33:17 UTC (rev 41070)
@@ -270,13 +270,14 @@
set_property(TARGET openNURBS PROPERTY LINK_INTERFACE_LIBRARIES "")
install(TARGETS openNURBS DESTINATION lib)
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})
install(TARGETS openNURBS-static ARCHIVE DESTINATION lib)
SET_TARGET_PROPERTIES(openNURBS-static PROPERTIES OUTPUT_NAME "openNURBS")
ENDIF(BUILD_STATIC_LIBS)
+ENDIF(NOT MSVC)
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.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
