Revision: 41109
http://brlcad.svn.sourceforge.net/brlcad/?rev=41109&view=rev
Author: starseeker
Date: 2010-10-19 17:17:05 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
If the static libraries really are .lib files that aren't doing the
dll_import/dll_export thing, then it's quite plausible that the static builds
were actually overwriting the dynamic .lib linking files, whereas on other
platforms the different extension avoids any issue. Let's try that and enable
static libs on WIN32 again.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
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 17:11:11 UTC
(rev 41108)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-10-19 17:17:05 UTC
(rev 41109)
@@ -53,7 +53,9 @@
if(NOT ${libs} MATCHES "NONE")
target_link_libraries(${libname}-static ${libslist})
endif(NOT ${libs} MATCHES "NONE")
- SET_TARGET_PROPERTIES(${libname}-static PROPERTIES OUTPUT_NAME
"${libname}")
+ IF(NOT WIN32)
+ SET_TARGET_PROPERTIES(${libname}-static PROPERTIES
OUTPUT_NAME "${libname}")
+ ENDIF(NOT WIN32)
IF(WIN32)
# We need the lib prefix on win32, so add it even if our
add_library
# wrapper function has removed it due to the target name - see
Modified: brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-10-19
17:11:11 UTC (rev 41108)
+++ brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-10-19
17:17:05 UTC (rev 41109)
@@ -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 WIN32)
+ SET_TARGET_PROPERTIES(regex-static PROPERTIES OUTPUT_NAME "regex")
+ENDIF(NOT WIN32)
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
17:11:11 UTC (rev 41108)
+++ brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2010-10-19
17:17:05 UTC (rev 41109)
@@ -59,12 +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})
+IF(NOT WIN32)
+ SET_TARGET_PROPERTIES(utahrle-static PROPERTIES OUTPUT_NAME "utahrle")
+ENDIF(NOT WIN32)
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
17:11:11 UTC (rev 41108)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-10-19
17:17:05 UTC (rev 41109)
@@ -270,14 +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")
+ 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 ARCHIVE DESTINATION lib)
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
