Revision: 40971
http://brlcad.svn.sourceforge.net/brlcad/?rev=40971&view=rev
Author: starseeker
Date: 2010-10-13 13:55:01 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Getting closer - gethostname still isn't working as expected on Windows, but if
the HOST file is manually created we can now get as far as building libbu.
libbn wants libbu.lib, which apparently isn't being built by default.. hmm.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in
brlcad/branches/cmake/src/libbu/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-13 13:34:40 UTC (rev
40970)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-13 13:55:01 UTC (rev
40971)
@@ -1160,10 +1160,19 @@
# HOST
configure_file(${BRLCAD_CMAKE_DIR}/test_srcs/report_hostname.c.in
${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c)
+IF(NOT MSVC)
TRY_RUN(TIME_RESULT TIME_COMPILED
${CMAKE_BINARY_DIR}/CMakeTmp
${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c
OUTPUT_VARIABLE COMPILEMESSAGES)
+ELSE(NOT MSVC)
+SET(CMAKE_REQUIRED_LIBRARIES ws2_32.lib)
+TRY_RUN(TIME_RESULT TIME_COMPILED
+ ${CMAKE_BINARY_DIR}/CMakeTmp
+ ${CMAKE_BINARY_DIR}/CMakeTmp/report_hostname.c
+ OUTPUT_VARIABLE COMPILEMESSAGES
+ CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=ws2_32.lib")
+ENDIF(NOT MSVC)
FILE(APPEND ${BRLCAD_BINARY_DIR}/include/conf/HOST "\n")
# USER
Modified: brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
===================================================================
--- brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
2010-10-13 13:34:40 UTC (rev 40970)
+++ brlcad/branches/cmake/misc/CMake/test_srcs/report_hostname.c.in
2010-10-13 13:55:01 UTC (rev 40971)
@@ -1,5 +1,9 @@
#include <stdio.h>
-#include <unistd.h>
+#ifdef _WIN32
+ #include <WinSock2.h>
+#else
+ #include <unistd.h>
+#endif
#define chararraysize 2048
int main(void) {
int i;
Modified: brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in
===================================================================
--- brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in
2010-10-13 13:34:40 UTC (rev 40970)
+++ brlcad/branches/cmake/misc/CMake/test_srcs/report_username.c.in
2010-10-13 13:55:01 UTC (rev 40971)
@@ -1,9 +1,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#ifdef WIN32
#define USERVAR "USERNAME"
#else
+ #include <unistd.h>
#define USERVAR "USER"
#endif
#define chararraysize 2048
@@ -11,6 +11,7 @@
int i;
FILE *outfp = NULL;
outfp = fopen("${BRLCAD_BINARY_DIR}/include/conf/USER", "w");
+ printf("user name: %s\n", getenv(USERVAR));
fprintf(outfp, "\"%s\"", getenv(USERVAR));
fclose(outfp);
return 0;
Modified: brlcad/branches/cmake/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-10-13 13:34:40 UTC
(rev 40970)
+++ brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-10-13 13:55:01 UTC
(rev 40971)
@@ -79,7 +79,11 @@
xdr.c
)
-BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}" "${CMAKE_THREAD_LIBS_INIT}
${PNG_LIBRARY} ${TCL_LIBRARY}" STRICT)
+IF(MSVC)
+ SET(WIN32LIBS ws2_32.lib)
+ENDIF(MSVC)
+
+BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}" "${CMAKE_THREAD_LIBS_INIT}
${PNG_LIBRARY} ${TCL_LIBRARY} ${WIN32LIBS}" STRICT)
SET_TARGET_PROPERTIES(libbu PROPERTIES VERSION 19.0.1 SOVERSION 19)
IF(BRLCAD_BUILD_LOCAL_TCL)
ADD_DEPENDENCIES(libbu tcl)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-13 13:34:40 UTC
(rev 40970)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-13 13:55:01 UTC
(rev 40971)
@@ -103,7 +103,11 @@
THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TCL tcl src/other/tcl unix "")
ENDIF(MSVC)
IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS)
- SET(TCL_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl8.5${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "TCL_LIBRARY" FORCE)
+ IF(MSVC)
+ SET(TCL_LIBRARY "${BRLCAD_PREFIX}/lib/tcl85.lib" CACHE STRING
"TCL_LIBRARY" FORCE)
+ ELSE(MSVC)
+ SET(TCL_LIBRARY
"${BRLCAD_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl8.5${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "TCL_LIBRARY" FORCE)
+ ENDIF(MSVC)
SET(TCL_INCLUDE_PATH "${BRLCAD_PREFIX}/include" CACHE STRING
"TCL_INCLUDE_PATH" FORCE)
SET(TCL_CONF_PREFIX "${BRLCAD_PREFIX}/lib" CACHE STRING
"TCL_CONF_PREFIX" FORCE)
FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_TCL_H 1\n")
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
