Revision: 40964
http://brlcad.svn.sourceforge.net/brlcad/?rev=40964&view=rev
Author: starseeker
Date: 2010-10-10 13:05:34 +0000 (Sun, 10 Oct 2010)
Log Message:
-----------
This gets slightly closer to building tcl/tk on Windows, but with the following
restrictions - need to use the nmake generation, not MSVC (limitation of tcl/tk
builds), so far tested only with command line cmake invocation, and tk build is
still failing (common.h is asking for stdint.h and its not found, need to check
out why.)
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-09 15:11:47 UTC (rev
40963)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-10 13:05:34 UTC (rev
40964)
@@ -239,7 +239,7 @@
SET(BRLCAD_PREFIX "/usr/brlcad")
endif (NOT BRLCAD_PREFIX)
ELSE(NOT WIN32)
- SET(BRLCAD_PREFIX "C:/Program Files/BRL-CAD")
+ SET(BRLCAD_PREFIX "C:/BRL-CAD")
ENDIF(NOT WIN32)
ENDIF(NOT BRLCAD_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${BRLCAD_PREFIX}")
Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-10-09 15:11:47 UTC
(rev 40963)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-10-10 13:05:34 UTC
(rev 40964)
@@ -65,7 +65,7 @@
PREFIX
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
SOURCE_DIR
${${CMAKE_PROJECT_NAME}_SOURCE_DIR}/${projpath}/${srcpath}
CONFIGURE_COMMAND ""
- BUILD_COMMAND C:\\Program\ Files\ \(x86\)\\Microsoft\
Visual\ Studio\ 9.0\\VC\\bin\\vcvars32.bat && cd <SOURCE_DIR> && nmake -f
makefile.vc INSTALLDIR=${CMAKE_INSTALL_PREFIX} ${extraopts}
+ BUILD_COMMAND cd <SOURCE_DIR> && nmake -f makefile.vc
INSTALLDIR=${CMAKE_INSTALL_PREFIX} ${extraopts}
INSTALL_COMMAND cd <SOURCE_DIR> && nmake -f
makefile.vc INSTALLDIR=${CMAKE_INSTALL_PREFIX} ${extraopts} install
)
SET(CMAKE_EXTERNAL_TARGET_LIST
"${CMAKE_EXTERNAL_TARGET_LIST};${projname}" CACHE STRING "external target list"
FORCE)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-09 15:11:47 UTC
(rev 40963)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-10 13:05:34 UTC
(rev 40964)
@@ -110,7 +110,11 @@
ELSE(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
BRLCAD_INCLUDE_FILE(tcl.h HAVE_TCL_H)
ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
-THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TK tk src/other/tk unix
"--with-tcl=${TCL_CONF_PREFIX}")
+IF(MSVC)
+ THIRD_PARTY_NMAKE_EXTERNAL_PROJECT(TK tk src/other/tk win
"TCLDIR=${CMAKE_CURRENT_SOURCE_DIR}/tcl")
+ELSE(MSVC)
+ 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)
SET(TK_INCLUDE_PATH "${BRLCAD_PREFIX}/include" CACHE STRING
"TK_INCLUDE_PATH" FORCE)
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
