Revision: 40605
http://brlcad.svn.sourceforge.net/brlcad/?rev=40605&view=rev
Author: starseeker
Date: 2010-09-18 11:13:38 +0000 (Sat, 18 Sep 2010)
Log Message:
-----------
Conditionalize librtserver on finding the jni.h header, and fix some labels.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-17 21:20:18 UTC (rev
40604)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-18 11:13:38 UTC (rev
40605)
@@ -373,10 +373,16 @@
OPTION(BRLCAD-ENABLE_BENCHMARK_ONLY "Enable just the benchmark target and its
requirements." OFF)
#MARK_AS_ADVANCED(BRLCAD-ENABLE_BENCHMARK_ONLY)
-# Turn on just the benchmark build. This is not an exclusive flag -
+# Enable the librtserver build
+OPTION(BRLCAD-ENABLE_RTSERVER "Enable the rtserver target." ON)
+
+# Turn on just the librtserver build. This is not an exclusive flag -
# enabling this does not force off other explicitly enabled targets.
OPTION(BRLCAD-ENABLE_RTSERVER_ONLY "Enable just the rtserver target and its
requirements." OFF)
#MARK_AS_ADVANCED(BRLCAD-ENABLE_RTSERVER_ONLY)
+IF(BRLCAD-ENABLE_RTSERVER_ONLY)
+ SET(BRLCAD-ENABLE_RTSERVER ON)
+ENDIF(BRLCAD-ENABLE_RTSERVER_ONLY)
# Global third party controls - these options enable and disable ALL
# local copies of libraries in src/other. For finer grain control,
@@ -612,6 +618,10 @@
BRLCAD_INCLUDE_FILE(JavaVM/jni.h HAVE_JAVAVM_JNI_H)
BRLCAD_INCLUDE_FILE(jni.h HAVE_JNI_H)
ENDIF(JNI_FOUND AND JAVA_FOUND)
+IF(NOT HAVE_JNI_H AND NOT HAVE_JAVAVM_JNI_H)
+ SET(BRLCAD-ENABLE_RTSERVER OFF)
+ MESSAGE("librtserver build requested, but JNI header not found - disabling")
+ENDIF(NOT HAVE_JNI_H AND NOT HAVE_JAVAVM_JNI_H)
# Find X11 if it is enabled
IF(BRLCAD-ENABLE_X11)
@@ -1011,7 +1021,7 @@
SET(BRLCAD_BUILD_LOCAL_SCL_LABEL "Build NIST STEP Class Libraries ")
SET(BRLCAD-ENABLE_X11_LABEL "X11 support (optional) ")
SET(BRLCAD-ENABLE_OPENGL_LABEL "OpenGL support (optional) ")
- SET(BRLCAD-ENABLE_RTSERVERJDK_LABEL "librtserver JDK support (optional)
")
+ SET(BRLCAD-ENABLE_RTSERVER_LABEL "librtserver JDK support (optional) ")
SET(BRLCAD-ENABLE_RUNTIMEDEBUGGING_LABEL "Enable run-time debugging
(optional) ")
if (BRLCAD-ENABLE_64BIT)
set(BRLCAD_ARCH_BITSETTING "ON")
@@ -1028,9 +1038,9 @@
SET(BRLCAD-ENABLE_DYNAMICLIBS_LABEL "Build dynamic libraries ")
SET(BRLCAD-ENABLE_VERBOSEWARN_LABEL "Print verbose compilation warnings
")
SET(BRLCAD-ENABLE_VERBOSEPROGRESS_LABEL "Print verbose compilation
progress ")
- SET(BRLCAD-BUILD_BENCHMARK_ONLY_LABEL "Only build benchmark suite ")
- SET(BRLCAD-BUILD_RTSERVER_ONLY_LABEL "Only build librtserver ")
- SET(BRLCAD-BUILD_GEOMETRY_LABEL "Install example geometry models ")
+ SET(BRLCAD-ENABLE_BENCHMARK_ONLY_LABEL "Only build benchmark suite ")
+ SET(BRLCAD-ENABLE_RTSERVER_ONLY_LABEL "Only build librtserver ")
+ SET(BRLCAD-INSTALL_EXAMPLE_GEOMETRY_LABEL "Install example geometry
models ")
if (BRLCAD-BUILD_EXTRADOCS)
if (BRLCAD-BUILD_EXTRADOCS_PDF)
set(BRLCAD-BUILD_DOCBUILD_MSG "ON (man/html/pdf)")
@@ -1043,8 +1053,8 @@
SET(BRLCAD-BUILD_DOCBUILD_MSG_LABEL "Build extra docs ")
SET(SETTINGLIST1 BRLCAD_BUILD_LOCAL_TCL BRLCAD_BUILD_LOCAL_TK
BRLCAD_BUILD_LOCAL_INCRTCL BRLCAD_BUILD_LOCAL_IWIDGETS
BRLCAD_BUILD_LOCAL_TKHTML BRLCAD_BUILD_LOCAL_TKPNG BRLCAD_BUILD_LOCAL_TKTABLE
BRLCAD_BUILD_LOCAL_PNG BRLCAD_BUILD_LOCAL_REGEX BRLCAD_BUILD_LOCAL_ZLIB
BRLCAD_BUILD_LOCAL_TERMLIB BRLCAD_BUILD_LOCAL_UTAHRLE
BRLCAD_BUILD_LOCAL_OPENNURBS BRLCAD_BUILD_LOCAL_SCL)
- SET(SETTINGLIST2 BRLCAD-ENABLE_X11 BRLCAD-ENABLE_OPENGL
BRLCAD-ENABLE_RTSERVERJDK BRLCAD-ENABLE_RUNTIMEDEBUGGING )
- SET(SETTINGLIST3 BRLCAD_ARCH_BITSETTING BRLCAD-ENABLE_OPTIMIZED
BRLCAD-ENABLE_DEBUG BRLCAD-ENABLE_PROFILE BRLCAD-ENABLE_SMP
BRLCAD-ENABLE_STATICLIBS BRLCAD-ENABLE_DYNAMICLIBS BRLCAD-ENABLE_VERBOSEWARN
BRLCAD-ENABLE_VERBOSEPROGRESS BRLCAD-BUILD_BENCHMARK_ONLY
BRLCAD-BUILD_RTSERVER_ONLY BRLCAD-BUILD_GEOMETRY BRLCAD-BUILD_DOCBUILD_MSG)
+ SET(SETTINGLIST2 BRLCAD-ENABLE_X11 BRLCAD-ENABLE_OPENGL
BRLCAD-ENABLE_RTSERVER BRLCAD-ENABLE_RUNTIMEDEBUGGING )
+ SET(SETTINGLIST3 BRLCAD_ARCH_BITSETTING BRLCAD-ENABLE_OPTIMIZED
BRLCAD-ENABLE_DEBUG BRLCAD-ENABLE_PROFILE BRLCAD-ENABLE_SMP
BRLCAD-ENABLE_STATICLIBS BRLCAD-ENABLE_DYNAMICLIBS BRLCAD-ENABLE_VERBOSEWARN
BRLCAD-ENABLE_VERBOSEPROGRESS BRLCAD-ENABLE_BENCHMARK_ONLY
BRLCAD-ENABLE_RTSERVER_ONLY BRLCAD-INSTALL_EXAMPLE_GEOMETRY
BRLCAD-BUILD_DOCBUILD_MSG)
SET(ARRAYLIST SETTINGLIST1 SETTINGLIST2 SETTINGLIST3)
SET(SETTINGLABELLENGTH 0)
FOREACH(setting_array ${ARRAYLIST})
Modified: brlcad/branches/cmake/src/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/CMakeLists.txt 2010-09-17 21:20:18 UTC (rev
40604)
+++ brlcad/branches/cmake/src/CMakeLists.txt 2010-09-18 11:13:38 UTC (rev
40605)
@@ -122,26 +122,28 @@
# put it all together #
#######################
-IF(BRLCAD-BUILD_BENCHMARK_ONLY)
+IF(BRLCAD-ENABLE_BENCHMARK_ONLY)
FOREACH(subdir ${benchmark_dirs})
ADD_SUBDIRECTORY(${subdir})
ENDFOREACH(subdir ${benchmark_dirs})
- IF(BRLCAD-BUILD_RTSERVER_ONLY)
+ IF(BRLCAD-ENABLE_RTSERVER_ONLY AND BRLCAD-ENABLE_RTSERVER)
ADD_SUBDIRECTORY(librtserver)
- ENDIF(BRLCAD-BUILD_RTSERVER_ONLY)
-ENDIF(BRLCAD-BUILD_BENCHMARK_ONLY)
+ ENDIF(BRLCAD-ENABLE_RTSERVER_ONLY AND BRLCAD-ENABLE_RTSERVER)
+ENDIF(BRLCAD-ENABLE_BENCHMARK_ONLY)
-IF(BRLCAD-BUILD_RTSERVER_ONLY)
+IF(BRLCAD-ENABLE_RTSERVER_ONLY AND BRLCAD-ENABLE_RTSERVER)
ADD_SUBDIRECTORY(librtserver)
-ENDIF(BRLCAD-BUILD_RTSERVER_ONLY)
+ENDIF(BRLCAD-ENABLE_RTSERVER_ONLY AND BRLCAD-ENABLE_RTSERVER)
-IF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
+IF(NOT BRLCAD-ENABLE_BENCHMARK_ONLY AND NOT BRLCAD-ENABLE_RTSERVER_ONLY)
FOREACH(subdir ${benchmark_dirs})
ADD_SUBDIRECTORY(${subdir})
ENDFOREACH(subdir ${benchmark_dirs})
- ADD_SUBDIRECTORY(librtserver)
+ IF(BRLCAD-ENABLE_RTSERVER)
+ ADD_SUBDIRECTORY(librtserver)
+ ENDIF(BRLCAD-ENABLE_RTSERVER)
FOREACH(subdir ${remaining_dirs})
ADD_SUBDIRECTORY(${subdir})
ENDFOREACH(subdir ${remaining_dirs})
-ENDIF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
+ENDIF(NOT BRLCAD-ENABLE_BENCHMARK_ONLY AND NOT BRLCAD-ENABLE_RTSERVER_ONLY)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
