Revision: 40993
http://brlcad.svn.sourceforge.net/brlcad/?rev=40993&view=rev
Author: starseeker
Date: 2010-10-14 05:33:42 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
Making some progress - no tcl/tk package fun yet, but getting closer to
building the requirements for rt, start adding DLL definitions to libs, point
Win tk to something sensible, etc.
Modified Paths:
--------------
brlcad/branches/cmake/src/libanalyze/CMakeLists.txt
brlcad/branches/cmake/src/libdm/CMakeLists.txt
brlcad/branches/cmake/src/libfb/CMakeLists.txt
brlcad/branches/cmake/src/librt/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
Modified: brlcad/branches/cmake/src/libanalyze/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libanalyze/CMakeLists.txt 2010-10-14 05:09:57 UTC
(rev 40992)
+++ brlcad/branches/cmake/src/libanalyze/CMakeLists.txt 2010-10-14 05:33:42 UTC
(rev 40993)
@@ -7,5 +7,11 @@
${TCL_INCLUDE_PATH}
)
+IF(MSVC)
+ add_definitions(
+ -DANALYZE_EXPORT_DLL
+ )
+ENDIF(MSVC)
+
BRLCAD_ADDLIB(libanalyze "${LIBANALYZE_SOURCES}" libbu)
SET_TARGET_PROPERTIES(libanalyze PROPERTIES VERSION 19.0.1 SOVERSION 19)
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-10-14 05:09:57 UTC
(rev 40992)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-10-14 05:33:42 UTC
(rev 40993)
@@ -65,6 +65,14 @@
SET(DM_XLIBS "${DM_XLIBS} ${xlib}")
ENDFOREACH(xlib ${X11_LIBRARIES})
+IF(MSVC)
+ add_definitions(
+ -DDM_EXPORT_DLL
+ -DDM_WGL
+ -DIF_WGL
+ )
+ENDIF(MSVC)
+
BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}" "librt libfb libged ${DM_XLIBS}
${X11_Xi_LIB} ${DM_TKLIB} ${Carbon_LIBRARIES}")
SET_TARGET_PROPERTIES(libdm PROPERTIES VERSION 19.0.1 SOVERSION 19)
IF(BRLCAD_BUILD_LOCAL_TK AND BRLCAD-ENABLE_TK)
Modified: brlcad/branches/cmake/src/libfb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-10-14 05:09:57 UTC
(rev 40992)
+++ brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-10-14 05:33:42 UTC
(rev 40993)
@@ -6,12 +6,19 @@
SET(LINKLIBS "${LINKLIBS} ${xlib}")
ENDFOREACH(xlib ${X11_LIBRARIES})
endif()
-if(BRLCAD-ENABLE_OPENGL AND OPENGL_FOUND)
+if(BRLCAD-ENABLE_OPENGL AND OPENGL_FOUND AND NOT MSVC)
SET(FBOGLDEFS "-DIF_OGL")
FOREACH(ogllib ${OPENGL_LIBRARIES})
SET(LINKLIBS "${LINKLIBS} ${ogllib}")
ENDFOREACH(ogllib ${OPENGL_LIBRARIES})
endif()
+IF(MSVC)
+ add_definitions(
+ -DFB_EXPORT_DLL
+ -DIF_WGL
+ )
+ SET(LINKLIBS "${LINKLIBS} opengl32.lib ${TK_LIBRARY}")
+ENDIF(MSVC)
set(LIBFB_SOURCES
asize.c
Modified: brlcad/branches/cmake/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-10-14 05:09:57 UTC
(rev 40992)
+++ brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-10-14 05:33:42 UTC
(rev 40993)
@@ -225,6 +225,9 @@
${LIBRT_SOURCES}
timer-nt.c
)
+ add_definitions(
+ -DRT_EXPORT_DLL
+ )
else(MSVC)
set(LIBRT_SOURCES
${LIBRT_SOURCES}
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-14 05:09:57 UTC
(rev 40992)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-14 05:33:42 UTC
(rev 40993)
@@ -120,7 +120,11 @@
THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TK tk src/other/tk unix
"--with-tcl=${TCL_CONF_PREFIX}")
ENDIF(MSVC)
IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
- SET(TK_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tk8.5${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "TK_LIBRARY" FORCE)
+ IF(MSVC)
+ SET(TK_LIBRARY "${BRLCAD_PREFIX}/lib/tk85.lib" CACHE STRING
"TK_LIBRARY" FORCE)
+ ELSE(MSVC)
+ SET(TK_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tk8.5${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "TK_LIBRARY" FORCE)
+ ENDIF(MSVC)
SET(TK_INCLUDE_PATH "${BRLCAD_PREFIX}/include" CACHE STRING
"TK_INCLUDE_PATH" FORCE)
SET(TK_CONF_PREFIX "${BRLCAD_PREFIX}/lib" CACHE STRING "TK_CONF_PREFIX"
FORCE)
FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_TK_H 1\n")
Modified: brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-10-14
05:09:57 UTC (rev 40992)
+++ brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2010-10-14
05:33:42 UTC (rev 40993)
@@ -1,4 +1,6 @@
-include_directories(${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/include)
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/include)
set(LIBREGEX_PUBLIC_HDRS
regex.h
@@ -11,6 +13,13 @@
regfree.c
)
+IF(MSVC)
+ add_definitions(
+ -DREGEX_EXPORT_DLL
+ -DBRLCAD_DLL
+ )
+ENDIF(MSVC)
+
add_library(regex SHARED ${LIBREGEX_SOURCES})
INSTALL(TARGETS regex DESTINATION lib)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
