Menu
▾
▴
xml-cppdom-checkins
|
From: <pat...@us...> - 2009-03-02 15:11:50
|
Revision: 634
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=634&view=rev
Author: patrickh
Date: 2009-03-02 15:11:45 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Roll the trunk version to 1.1.0.
Modified Paths:
--------------
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2009-03-02 15:08:15 UTC (rev 633)
+++ trunk/cppdom/version.h 2009-03-02 15:11:45 UTC (rev 634)
@@ -54,7 +54,7 @@
*/
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
-#define CPPDOM_VERSION_MINOR 0
+#define CPPDOM_VERSION_MINOR 1
#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2009-03-02 15:08:15 UTC (rev 633)
+++ trunk/cppdom.spec 2009-03-02 15:11:45 UTC (rev 634)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 1.0.0
+%define version 1.1.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Mon Mar 02 2009 Patrick Hartling <pat...@pr...> 1.1.0-1
+- Updated to version 1.1.0.
+
* Mon Mar 02 2009 Patrick Hartling <pat...@pr...> 1.0.0-1
- Updated to version 1.0.0.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-03-02 15:06:51
|
Revision: 631
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=631&view=rev
Author: patrickh
Date: 2009-03-02 15:06:42 +0000 (Mon, 02 Mar 2009)
Log Message:
-----------
Since 0.7.10 was releaseed, the only changes have been to the build system.
As such, it seems to me that this code is stable and not likely to undergo
any major changes. That spells "one-point-oh" to me.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-31 14:20:23 UTC (rev 630)
+++ trunk/ChangeLog 2009-03-02 15:06:42 UTC (rev 631)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+[Version 1.0.0 released - 3.2.2009]============================================
+
2007-08-01 patrickh Updated for SConsAddons changes. On Windows, the
build formerly called "hybrid" is now the "debug"
build. The DLL is installed in lib\debug. The build
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2007-08-31 14:20:23 UTC (rev 630)
+++ trunk/cppdom/version.h 2009-03-02 15:06:42 UTC (rev 631)
@@ -53,9 +53,9 @@
* <major><minor><patch>. Each part has exactly 3 digits.
*/
// The major/minor/patch version (up to 3 digits each).
-#define CPPDOM_VERSION_MAJOR 0
-#define CPPDOM_VERSION_MINOR 7
-#define CPPDOM_VERSION_PATCH 10
+#define CPPDOM_VERSION_MAJOR 1
+#define CPPDOM_VERSION_MINOR 0
+#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2007-08-31 14:20:23 UTC (rev 630)
+++ trunk/cppdom.spec 2009-03-02 15:06:42 UTC (rev 631)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 0.7.10
+%define version 1.0.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Mon Mar 02 2009 Patrick Hartling <pat...@pr...> 1.0.0-1
+- Updated to version 1.0.0.
+
* Wed Aug 01 2007 Patrick Hartling <pa...@in...> 0.7.10-1
- Updated to version 0.7.10.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-03-06 16:03:36
|
Revision: 638
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=638&view=rev
Author: patrickh
Date: 2010-03-06 16:03:29 +0000 (Sat, 06 Mar 2010)
Log Message:
-----------
>From the patch submission:
cppdom::Attribute has (among others) the following c'tor:
template <class T>
Attribute(const T& val);
and an output operator:
std::ostream& operator<<(std::ostream& os, const Attribute& att);
together these two constructs will grab any type that does not have a
operator<< overload of its own and turn it into an infinite recursion at
runtime (because the above c'tor uses setValue<T>(val) which uses a
std::ostringstream to convert val into a string representation.
Bumped the version to 1.1.0.
Submited by: Carsten Neumann
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/cppdom.h
trunk/cppdom/version.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-06 16:00:44 UTC (rev 637)
+++ trunk/ChangeLog 2010-03-06 16:03:29 UTC (rev 638)
@@ -1,5 +1,11 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2010-03-06 patrickh Fixed conflicts with the operator<< overload for
+ std::ostream and implicit constructio of
+ cppdom::Attribute objects.
+ Submitted by: Carsten Neumann
+ VERSION: 1.1.1
+
[Version 1.0.0 released - 3.2.2009]============================================
2007-08-01 patrickh Updated for SConsAddons changes. On Windows, the
Modified: trunk/cppdom/cppdom.h
===================================================================
--- trunk/cppdom/cppdom.h 2010-03-06 16:00:44 UTC (rev 637)
+++ trunk/cppdom/cppdom.h 2010-03-06 16:03:29 UTC (rev 638)
@@ -335,7 +335,7 @@
#ifndef CPPDOM_NO_MEMBER_TEMPLATES
template<class T>
- Attribute(const T& val)
+ explicit Attribute(const T& val)
{
setValue<T>(val);
}
@@ -548,6 +548,24 @@
*/
void setAttribute(const std::string& attr, const Attribute& value);
+ /**
+ * Sets new attribute value.
+ *
+ * @post Element.attr is set to value. If it did not exist before, now
+ * it does.
+ *
+ * @param attr Attribute name to set. There must not be ANY spaces in
+ * this name.
+ * @param value Attribute value to set.
+ *
+ * @since 1.1.1
+ */
+ template<class T>
+ void setAttribute(const std::string& attr, const T& value)
+ {
+ setAttribute(attr, Attribute(value));
+ }
+
/** Direct access to attribute map. */
Attributes& attrib();
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2010-03-06 16:00:44 UTC (rev 637)
+++ trunk/cppdom/version.h 2010-03-06 16:03:29 UTC (rev 638)
@@ -55,7 +55,7 @@
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
#define CPPDOM_VERSION_MINOR 1
-#define CPPDOM_VERSION_PATCH 0
+#define CPPDOM_VERSION_PATCH 1
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2010-04-14 13:26:46
|
Revision: 655
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=655&view=rev
Author: patrickh
Date: 2010-04-14 13:26:39 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
Roll the version to 1.1.2.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-04-14 13:25:20 UTC (rev 654)
+++ trunk/ChangeLog 2010-04-14 13:26:39 UTC (rev 655)
@@ -1,5 +1,8 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2010-04-14 patrickh Preserve newlines in CDATA.
+ Submitted by: Carsten Neumann
+ VERSION: 1.1.2
2010-03-06 patrickh Fixed conflicts with the operator<< overload for
std::ostream and implicit constructio of
cppdom::Attribute objects.
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2010-04-14 13:25:20 UTC (rev 654)
+++ trunk/cppdom/version.h 2010-04-14 13:26:39 UTC (rev 655)
@@ -55,7 +55,7 @@
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
#define CPPDOM_VERSION_MINOR 1
-#define CPPDOM_VERSION_PATCH 1
+#define CPPDOM_VERSION_PATCH 2
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2010-04-14 13:25:20 UTC (rev 654)
+++ trunk/cppdom.spec 2010-04-14 13:26:39 UTC (rev 655)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 1.1.1
+%define version 1.1.2
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Wed Apr 14 2010 Patrick Hartling <pa...@pr...> 1.1.2-1
+- Updated to version 1.1.2.
+
* Sat Mar 06 2010 Patrick Hartling <pa...@pr...> 1.1.1-1
- Updated to version 1.1.1.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-04-23 22:08:43
|
Revision: 678
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=678&view=rev
Author: patrickh
Date: 2011-04-23 22:08:36 +0000 (Sat, 23 Apr 2011)
Log Message:
-----------
Updated the build to work with, and require, SCons 2.0.
Modified Paths:
--------------
trunk/ChangeLog
trunk/SConstruct
trunk/cppdom/SConscript
trunk/test/SConscript
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/ChangeLog 2011-04-23 22:08:36 UTC (rev 678)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2011-04-23 patrickh SCons 2.0 is now the minimum required version.
+ Submitted by Doug McCorkle.
2010-04-14 patrickh Preserve newlines in CDATA.
Submitted by: Carsten Neumann
VERSION: 1.1.2
Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/SConstruct 2011-04-23 22:08:36 UTC (rev 678)
@@ -27,7 +27,7 @@
#------------------------------------------------------------------------------
# Main build setup
#------------------------------------------------------------------------------
-EnsureSConsVersion(0,96)
+EnsureSConsVersion(2,0)
#SourceSignatures('MD5')
#SourceSignatures('timestamp')
SConsignFile('.sconsign.'+GetPlatform())
@@ -43,19 +43,20 @@
buildDir = "build." + platform
option_filename = "config.cache." + platform
+temp_env = dict(ENV = os.environ)
if GetPlatform() == "win32":
- if ARGUMENTS.has_key("MSVS_VERSION"):
- common_env = Environment(MSVS_VERSION = ARGUMENTS["MSVS_VERSION"])
- else:
- common_env = Environment()
- common_env["MSVS"] = {"VERSION" : common_env["MSVS_VERSION"]}
- print "Using MSVS version", common_env["MSVS"]["VERSION"]
-else:
- common_env = Environment(ENV = os.environ)
-SConsAddons.Builders.registerSubstBuilder(common_env)
-common_env["CONFIGUREDIR"] = '.sconf_temp_'+platform
-common_env["CONFIGURELOG"] = 'sconf.log_'+platform
+ if ARGUMENTS.has_key("MSVC_VERSION"):
+ temp_env["MSVC_VERSION"] = ARGUMENTS["MSVC_VERSION"]
+ if ARGUMENTS.has_key("MSVS_ARCH"):
+ temp_env["MSVS_ARCH"] = ARGUMENTS["MSVS_ARCH"]
+ temp_env["TARGET_ARCH"] = ARGUMENTS["MSVS_ARCH"]
+
+ temp_env["MSVS"] = {"VERSION" : temp_env["MSVC_VERSION"]}
+
+temp_env["CONFIGUREDIR"] = '.sconf_temp_'+platform
+temp_env["CONFIGURELOG"] = 'sconf.log_'+platform
+
# Create variant helper and builder
variant_helper = sca_variants.VariantsHelper()
base_bldr = EnvironmentBuilder()
@@ -71,8 +72,12 @@
opts.AddOption(sca_opts.SeparatorOption("\nPackage Options"))
opts.AddOption( cppunit_options )
opts.AddOption( boost_options )
+
base_bldr.addOptions(opts)
variant_helper.addOptions(opts)
+common_env = base_bldr.buildEnvironment(None,None,**temp_env)
+SConsAddons.Builders.registerSubstBuilder(common_env)
+
opts.AddOption(sca_opts.SeparatorOption("\nOther settings"))
opts.Add('prefix', 'Installation prefix', unspecified_prefix)
opts.Add('build_test', 'Build the test programs', 'yes')
@@ -108,7 +113,7 @@
base_bldr.readOptions(common_env)
base_bldr.enableWarnings()
- # Apply any common package options
+ # Apply any common package options
# Update environment for boost options
if boost_options.isAvailable():
boost_options.apply(common_env)
@@ -162,8 +167,8 @@
sub_dirs.append('test')
# ---- FOR EACH VARIANT ----- #
- for combo in variant_helper.iterate(locals(), base_bldr, common_env):
- #baseEnv = env_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts)
+ for combo in variant_helper.iterate(locals(), base_bldr, common_env):
+ #build_env = base_bldr.applyToEnvironment(common_env.Copy(), variant=combo,options=opts)
print " Processing combo: ", ", ".join(['%s:%s'%(i[0],i[1]) for i in combo.iteritems()])
inst_paths = copy.copy(base_inst_paths)
@@ -195,7 +200,7 @@
# Process subdirectories
full_build_dir = pj(buildDir,combo_dir)
for d in sub_dirs:
- SConscript(pj(d,'SConscript'), build_dir=pj(full_build_dir, d), duplicate=0)
+ SConscript(pj(d,'SConscript'), variant_dir=pj(full_build_dir, d), duplicate=0)
# Build up the provides vars for the .fpc files
inst_paths['flagpoll'] = pj(inst_paths['lib'],'flagpoll')
Modified: trunk/cppdom/SConscript
===================================================================
--- trunk/cppdom/SConscript 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/cppdom/SConscript 2011-04-23 22:08:36 UTC (rev 678)
@@ -27,7 +27,7 @@
if boost_options.isAvailable():
sources.append("SpiritParser.cpp")
-cppdom_lib_env = build_env.Copy()
+cppdom_lib_env = build_env.Clone()
cppdom_lib_env.Append(CPPPATH = [inst_paths['include'],])
if "debug" in combo["type"] or "debugrt" in combo["type"]:
@@ -40,10 +40,10 @@
# NOTE: The [:3] bit used before passing the MSVS_VERSION value to float()
# is to handle the case of Visual C++ Express Edition which appends "Exp"
# to the version number.
- if cppdom_lib_env.has_key('MSVS_VERSION') and float(cppdom_lib_env['MSVS_VERSION'][:3]) >= 8.0:
+ if cppdom_lib_env.has_key('MSVC_VERSION') and float(cppdom_lib_env['MSVC_VERSION'][:3]) >= 8.0:
shlinkcom = [shlinkcom,
'mt.exe -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
- cppdom_shared_lib_env = cppdom_lib_env.Copy()
+ cppdom_shared_lib_env = cppdom_lib_env.Clone()
cppdom_shared_lib_env.AppendUnique(CPPDEFINES = ["CPPDOM_EXPORTS"])
if GetPlatform() == 'darwin':
# TODO: The install name should probably include the installation
@@ -60,7 +60,7 @@
cppdom_shared_lib_env.Install(inst_paths['lib'], cppdom_lib)
if "static" in combo["libtype"]:
- cppdom_static_lib_env = cppdom_lib_env.Copy()
+ cppdom_static_lib_env = cppdom_lib_env.Clone()
cppdom_static_lib = cppdom_static_lib_env.StaticLibrary(cppdom_static_libname, sources)
cppdom_static_lib_env.Install(inst_paths['lib'], cppdom_static_lib)
Modified: trunk/test/SConscript
===================================================================
--- trunk/test/SConscript 2011-04-04 23:46:05 UTC (rev 677)
+++ trunk/test/SConscript 2011-04-23 22:08:36 UTC (rev 678)
@@ -4,7 +4,7 @@
import os
pj = os.path.join
-test_env = build_env.Copy()
+test_env = build_env.Clone()
test_env.Append(CPPPATH = [inst_paths['include'], '#test'],
LIBPATH = [inst_paths['lib'],],
LIBS = [cppdom_app_libname])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2011-05-01 16:08:01
|
Revision: 683
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=683&view=rev
Author: patrickh
Date: 2011-05-01 16:07:55 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Roll the version to 1.3.0.
Modified Paths:
--------------
trunk/ChangeLog
trunk/cppdom/version.h
trunk/cppdom.spec
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-05-01 16:05:20 UTC (rev 682)
+++ trunk/ChangeLog 2011-05-01 16:07:55 UTC (rev 683)
@@ -1,5 +1,7 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+[Version 1.2.0 released - 5.1.2011]============================================
+
2011-04-23 patrickh SCons 2.0 is now the minimum required version.
Submitted by Doug McCorkle.
2010-04-14 patrickh Preserve newlines in CDATA.
Modified: trunk/cppdom/version.h
===================================================================
--- trunk/cppdom/version.h 2011-05-01 16:05:20 UTC (rev 682)
+++ trunk/cppdom/version.h 2011-05-01 16:07:55 UTC (rev 683)
@@ -54,8 +54,8 @@
*/
// The major/minor/patch version (up to 3 digits each).
#define CPPDOM_VERSION_MAJOR 1
-#define CPPDOM_VERSION_MINOR 1
-#define CPPDOM_VERSION_PATCH 2
+#define CPPDOM_VERSION_MINOR 3
+#define CPPDOM_VERSION_PATCH 0
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
Modified: trunk/cppdom.spec
===================================================================
--- trunk/cppdom.spec 2011-05-01 16:05:20 UTC (rev 682)
+++ trunk/cppdom.spec 2011-05-01 16:07:55 UTC (rev 683)
@@ -1,6 +1,6 @@
# Spec file for cppdom.
%define name cppdom
-%define version 1.1.2
+%define version 1.3.0
%define release 1
Name: %{name}
@@ -127,6 +127,9 @@
%doc %{_docdir}/cppdom-%{version}/html
%changelog
+* Sun May 01 2011 Patrick Hartling <pa...@pr...> 1.3.0-1
+- Updated to version 1.3.0.
+
* Wed Apr 14 2010 Patrick Hartling <pa...@pr...> 1.1.2-1
- Updated to version 1.1.2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2012-07-04 20:30:54
|
Revision: 690
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=690&view=rev
Author: patrickh
Date: 2012-07-04 20:30:43 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Add the CMake build developed by Ryan Pavlik.
Modified Paths:
--------------
trunk/ChangeLog
Added Paths:
-----------
trunk/CMakeLists.txt
trunk/cmake/
trunk/cmake/AboutTheseModules.cmake
trunk/cmake/BoostTestTargets.cmake
trunk/cmake/BoostTestTargetsDynamic.h
trunk/cmake/BoostTestTargetsIncluded.h
trunk/cmake/BoostTestTargetsStatic.h
trunk/cmake/BundleOSGPlugins.cmake
trunk/cmake/BundleOSGRuntime.cmake
trunk/cmake/BundleVRJ22Runtime.cmake
trunk/cmake/BundleVRJ30Runtime.cmake
trunk/cmake/CheckMacHIDAPI.cmake
trunk/cmake/CheckMacHIDAPI.cpp
trunk/cmake/CheckVersion.cmake
trunk/cmake/CleanDirectoryList.cmake
trunk/cmake/CleanLibraryList.cmake
trunk/cmake/CopyResourcesToBuildTree.cmake
trunk/cmake/CppcheckTargets.cmake
trunk/cmake/CreateDashboardScripts.cmake
trunk/cmake/CreateImportedTarget.cmake
trunk/cmake/CreateLaunchers.cmake
trunk/cmake/DashboardScript.cmake.in
trunk/cmake/DoxygenTargets.cmake
trunk/cmake/DoxygenTargets.doxyfile.in
trunk/cmake/EnableExtraCompilerWarnings.cmake
trunk/cmake/EnableProfiling.cmake
trunk/cmake/FileCopyTargets.cmake
trunk/cmake/FindALUT.cmake
trunk/cmake/FindBluez.cmake
trunk/cmake/FindCPPDOM.cmake
trunk/cmake/FindDCubed.cmake
trunk/cmake/FindFlagpoll.cmake
trunk/cmake/FindGDB.cmake
trunk/cmake/FindGHOST.cmake
trunk/cmake/FindGLUI.cmake
trunk/cmake/FindGLUT.cmake
trunk/cmake/FindGMTL.cmake
trunk/cmake/FindGPM.cmake
trunk/cmake/FindGadgeteer12.cmake
trunk/cmake/FindGadgeteer20.cmake
trunk/cmake/FindGlove5DT.cmake
trunk/cmake/FindHIDAPI.cmake
trunk/cmake/FindJCCL12.cmake
trunk/cmake/FindJCCL14.cmake
trunk/cmake/FindJtTk.cmake
trunk/cmake/FindJtTk.stampkey.cmake.in
trunk/cmake/FindLAPACKLibs.cmake
trunk/cmake/FindLibusb1.cmake
trunk/cmake/FindLuabind.cmake
trunk/cmake/FindLyX.cmake
trunk/cmake/FindMacHID.cmake
trunk/cmake/FindOpenCV.cmake
trunk/cmake/FindOpenHaptics.cmake
trunk/cmake/FindOpenHaptics.cpp
trunk/cmake/FindParasolid.cmake
trunk/cmake/FindSonix12.cmake
trunk/cmake/FindSonix14.cmake
trunk/cmake/FindTR1.cmake
trunk/cmake/FindTooN.cmake
trunk/cmake/FindTooNtag.cmake
trunk/cmake/FindTweek12.cmake
trunk/cmake/FindTweek14.cmake
trunk/cmake/FindVPR20.cmake
trunk/cmake/FindVPR22.cmake
trunk/cmake/FindVPS.cmake
trunk/cmake/FindVRJ22.cmake
trunk/cmake/FindVRJ30.cmake
trunk/cmake/FindVRJOGL22.cmake
trunk/cmake/FindVRJOGL30.cmake
trunk/cmake/FindVRJuggler.cmake
trunk/cmake/FindVRJuggler22.cmake
trunk/cmake/FindVRJuggler30.cmake
trunk/cmake/FindVRPN.cmake
trunk/cmake/FindVirtuoseAPI.cmake
trunk/cmake/FindVirtuoseVPP.cmake
trunk/cmake/FindWiiSCAAT.cmake
trunk/cmake/FindWiiUse.cmake
trunk/cmake/FindWinHID.cmake
trunk/cmake/Findargp.cmake
trunk/cmake/Findcppcheck.cmake
trunk/cmake/Findcppcheck.cpp
trunk/cmake/Findcppunit.cmake
trunk/cmake/Findcutil.cmake
trunk/cmake/Finddb2pdf.cmake
trunk/cmake/FindosgLua.cmake
trunk/cmake/Findquatlib.cmake
trunk/cmake/GetCPUDetails.cmake
trunk/cmake/GetCompilerInfoString.cmake
trunk/cmake/GetDirectoryList.cmake
trunk/cmake/GetFileList.cmake
trunk/cmake/GetForceIncludeDefinitions.cmake
trunk/cmake/GetGitRevisionDescription.cmake
trunk/cmake/GetGitRevisionDescription.cmake.in
trunk/cmake/GetSubprojectStatus.cmake
trunk/cmake/LICENSE_1_0.txt
trunk/cmake/Licensing.cmake
trunk/cmake/ListCombinations.cmake
trunk/cmake/ListFilter.cmake
trunk/cmake/LuaTargets.cmake
trunk/cmake/MSVCMultipleProcessCompile.cmake
trunk/cmake/MSVCStaticRuntime.cmake
trunk/cmake/MSVCVerboseLinking.cmake
trunk/cmake/MakeVRJugglerAppBundle.cmake
trunk/cmake/MakeVRJugglerAppBundle30.cmake
trunk/cmake/OptionRequires.cmake
trunk/cmake/PrefixListGlob.cmake
trunk/cmake/ProgramFilesGlob.cmake
trunk/cmake/README.markdown
trunk/cmake/ResetConfigurations.cmake
trunk/cmake/SearchProgramFilesForOpenSceneGraph.cmake
trunk/cmake/SetDefaultBuildType.cmake
trunk/cmake/SplitLibraryList.cmake
trunk/cmake/StampSourcesWithVersion.cmake
trunk/cmake/StampSourcesWithVersion.sed.in
trunk/cmake/TCHARWorkaround.cmake
trunk/cmake/UseBackportedModules.cmake
trunk/cmake/UseTR1.cmake
trunk/cmake/WarningDev.cmake
trunk/cmake/cmake-2.8.0-modules/
trunk/cmake/cmake-2.8.0-modules/features/
trunk/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
trunk/cmake/cmake-2.8.0-modules/osg/
trunk/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake
trunk/cmake/cmake-2.8.0-modules/osg/Findosg.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake
trunk/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake
trunk/cmake/cmake-2.8.1-modules/
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
trunk/cmake/cmake-2.8.3-modules/
trunk/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
trunk/cmake/cmake-2.8.3-modules/autoinclude.cmake
trunk/cmake/cmake-2.8.4-modules/
trunk/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
trunk/cmake/cmake-2.8.4-modules/autoinclude.cmake
trunk/cmake/cmake-2.8.4-modules/boost/
trunk/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
trunk/cmake/cmake-2.9.0-modules/
trunk/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
trunk/cmake/cmake-2.9.0-modules/autoinclude.cmake
trunk/cmake/export-to-directory.sh
trunk/cmake/ghost-fake-stl/
trunk/cmake/ghost-fake-stl/iostream.h
trunk/cmake/ghost-fake-stl/list.h
trunk/cmake/ghost-fake-stl/set.h
trunk/cmake/ghost-fake-stl/vector.h
trunk/cmake/launcher-templates/
trunk/cmake/launcher-templates/genericlauncher.cmd.in
trunk/cmake/launcher-templates/genericlauncher.sh.in
trunk/cmake/launcher-templates/launcher.env.cmd.in
trunk/cmake/launcher-templates/launcher.env.sh.in
trunk/cmake/launcher-templates/perconfig.vcproj.user.in
trunk/cmake/launcher-templates/targetlauncher.cmd.in
trunk/cmake/launcher-templates/targetlauncher.sh.in
trunk/cmake/launcher-templates/vcproj.user.in
trunk/cmake/module-docs/
trunk/cmake/module-docs/AllModuleDependencies.dot
trunk/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake
trunk/cmake/module-docs/Example-FindMyPackage.cmake
trunk/cmake/module-docs/Example-FindMySimplePackage.cmake
trunk/cmake/module-help.html
trunk/cmake/module-help.txt
trunk/cmake/nested_targets/
trunk/cmake/nested_targets/DCubed/
trunk/cmake/nested_targets/DCubed/CMakeLists.txt
trunk/cmake/nested_targets/DCubed/d3ew_p/
trunk/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt
trunk/cmake/nested_targets/DCubed/d3ew_scene/
trunk/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt
trunk/cmake/nested_targets/OpenHaptics/
trunk/cmake/nested_targets/OpenHaptics/CMakeLists.txt
trunk/cmake/nested_targets/Parasolid/
trunk/cmake/nested_targets/Parasolid/CMakeLists.txt
trunk/cmake/nested_targets/cutil/
trunk/cmake/nested_targets/cutil/CMakeLists.txt
trunk/cmake/package/
trunk/cmake/package/macosx/
trunk/cmake/package/macosx/Resources/
trunk/cmake/package/macosx/Resources/en.lproj/
trunk/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/
trunk/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/classes.nib
trunk/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/info.nib
trunk/cmake/package/macosx/Resources/vrjuggler.plist
trunk/cmake/package/macosx/VRJuggler22BundleInfo.plist.in
trunk/cmake/package/macosx/VRJuggler30BundleInfo.plist.in
trunk/cmake/package/macosx/fixupbundle.cmake.in
trunk/cmake/package-licensing/
trunk/cmake/package-licensing/Boost.cmake
trunk/cmake/package-licensing/Eigen.cmake
trunk/cmake/package-licensing/FLTK.cmake
trunk/cmake/package-licensing/Lua.cmake
trunk/cmake/package-licensing/LuaBind.cmake
trunk/cmake/package-licensing/OpenHapticsAcademicEdition.cmake
trunk/cmake/package-licensing/OpenSceneGraph.cmake
trunk/cmake/package-licensing/PhysicalModelingUtils.cmake
trunk/cmake/package-licensing/Qt-LGPL.cmake
trunk/cmake/package-licensing/VPS.cmake
trunk/cmake/package-licensing/VRJuggLua.cmake
trunk/cmake/package-licensing/VRJuggler.cmake
trunk/cmake/package-licensing/VirtuoseAPI.cmake
trunk/cmake/package-licensing/osgLua.cmake
trunk/cmake/update-help.sh
trunk/cmake/workarounds/
trunk/cmake/workarounds/mac-alut-framework/
trunk/cmake/workarounds/mac-alut-framework/AL/
trunk/cmake/workarounds/mac-alut-framework/AL/alut.h
trunk/cmake/workarounds/mac-gl/
trunk/cmake/workarounds/mac-gl/GL/
trunk/cmake/workarounds/mac-gl/GL/gl.h
trunk/cmake/workarounds/mac-gl/GL/glui.h
trunk/cmake/workarounds/mac-gl/GL/glut.h
trunk/cmake/workarounds/mac-openal/
trunk/cmake/workarounds/mac-openal/AL/
trunk/cmake/workarounds/mac-openal/AL/al.h
trunk/cmake/workarounds/mac-openal/AL/alc.h
trunk/cmake/workarounds/tchar/
trunk/cmake/workarounds/tchar/tchar.h
trunk/cppdom/CMakeLists.txt
trunk/test/CMakeLists.txt
trunk/test/suite/CMakeLists.txt
Added: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt (rev 0)
+++ trunk/CMakeLists.txt 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,100 @@
+# CMake-based build system for cppdom
+# 2009-2011 Ryan Pavlik <rp...@ia...>
+# http://academic.cleardefinition.com/
+# Iowa State University HCI Graduate Program/VRAC
+
+cmake_minimum_required(VERSION 2.6.2)
+
+# Set package properties
+project(cppdom)
+
+set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION
+ "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+set(VERSION_UNDERSCORES "${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}")
+###
+# Set up options
+###
+
+# Define directories
+set(BIN_DIR bin)
+set(ARCH_DIR lib)
+set(FLAGPOLL_INFO_DIR share/flagpoll)
+if(WIN32)
+ set(LIB_DIR bin)
+ set(INCLUDE_DIR include)
+else()
+ set(LIB_DIR lib)
+ set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
+endif()
+
+# Create flagpoll file
+set(provides "cppdom")
+set(version "${CPACK_PACKAGE_VERSION}")
+set(prefix "\${fp_file_cwd}/../..")
+set(exec_prefix "\${prefix}")
+set(includedir "\${fp_file_cwd}/../../${INCLUDE_DIR}")
+set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
+# TODO this is not ideal/complete
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(arch "x86_64")
+else()
+ set(arch "x86")
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX)
+ set(cppdom_cxxflags "-Wno-deprecated")
+ set(include_path_flag "-I")
+ set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")
+ set(lib_path_flag "-L")
+elseif(MSVC)
+ set(include_path_flag "/I")
+ set(lib_path_flag "/L")
+else()
+ message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
+endif()
+
+configure_file(cppdom.fpc.in "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc"
+ DESTINATION ${FLAGPOLL_INFO_DIR}
+ COMPONENT Development)
+
+###
+# Perform build configuration of dependencies
+###
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+include(UseBackportedModules)
+include(CTest)
+
+find_package(Boost)
+
+###
+# Build the project
+###
+
+include_directories(.)
+add_subdirectory(cppdom)
+
+add_subdirectory(test)
+
+###
+# Set packaging options (for CPack)
+###
+
+# Choose desired package generators
+if(APPLE)
+ set(CPACK_GENERATOR DragNDrop)
+ set(CPACK_SOURCE_GENERATOR ZIP)
+elseif(WIN32)
+ set(CPACK_SOURCE_GENERATOR ZIP)
+else()
+ set(CPACK_SOURCE_GENERATOR TARGZ)
+endif()
+
+# Include the packaging system now that we have it all set up
+include(CPack)
+
+###
+# End Packaging
+###
Property changes on: trunk/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2012-07-04 20:24:18 UTC (rev 689)
+++ trunk/ChangeLog 2012-07-04 20:30:43 UTC (rev 690)
@@ -1,5 +1,8 @@
DATE AUTHOR CHANGE
---------- ----------- -------------------------------------------------------
+2012-07-04 patrickh Add CMake build.
+ Developed by Ryan Pavlik.
+
[Version 1.2.0 released - 5.1.2011]============================================
2011-04-23 patrickh SCons 2.0 is now the minimum required version.
Added: trunk/cmake/AboutTheseModules.cmake
===================================================================
--- trunk/cmake/AboutTheseModules.cmake (rev 0)
+++ trunk/cmake/AboutTheseModules.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,34 @@
+# - Dummy module containing information about these modules for the HELP file
+# This file documents a snapshot of the cmake-modules available from
+# http://github.com/rpavlik/cmake-modules/
+# The latest version of these modules can always be found there.
+# Additionally, you can find instructions on how to integrate these modules
+# into your own project either in the README.markdown file in this directory,
+# or on the GitHub page listed above (scroll to the bottom to see the README
+# rendered attractively).
+#
+# In short: Modules of the form "FindSomeName.cmake" are considered to be
+# "find modules", and are intended to be used indirectly by calling find_package,
+# not by calling include. Thus, you'll want to do something like:
+# find_package(SomeName)
+# They define a number of variables allowing you to use whatever software
+# they search for, such as include directories and libraries. A few also
+# define some functions for your use.
+#
+# All other modules provide functionality, either immediately upon including
+# them, or by defining functions that perform some task of varying utility
+# that you can use any time after including them. Note that if a module
+# has the filename, for example, cmake/BoostTestTargets.cmake, you only
+# need to call:
+# include(BoostTestTargets)
+#
+# For more information, see the documentation for individual modules, the
+# cmake-modules github page, and/or the upstream CMake documentation at
+# http://www.cmake.org/cmake/help/cmake-2-8-docs.html
+#
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
Property changes on: trunk/cmake/AboutTheseModules.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BoostTestTargets.cmake
===================================================================
--- trunk/cmake/BoostTestTargets.cmake (rev 0)
+++ trunk/cmake/BoostTestTargets.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,274 @@
+# - Add tests using boost::test
+#
+# Add this line to your test files in place of including a basic boost test header:
+# #include <BoostTestTargetConfig.h>
+#
+# If you cannot do that and must use the included form for a given test,
+# include the line
+# // OVERRIDE_BOOST_TEST_INCLUDED_WARNING
+# in the same file with the boost test include.
+#
+# include(BoostTestTargets)
+# add_boost_test(<testdriver_name> SOURCES <source1> [<more sources...>]
+# [FAIL_REGULAR_EXPRESSION <additional fail regex>]
+# [LAUNCHER <generic launcher script>]
+# [LIBRARIES <library> [<library>...]]
+# [RESOURCES <resource> [<resource>...]]
+# [TESTS <testcasename> [<testcasename>...]])
+#
+# If for some reason you need access to the executable target created,
+# it can be found in ${${testdriver_name}_TARGET_NAME} as specified when
+# you called add_boost_test
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Requires:
+# GetForceIncludeDefinitions
+# CopyResourcesToBuildTree
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__add_boost_test)
+ return()
+endif()
+set(__add_boost_test YES)
+
+set(BOOST_TEST_TARGET_PREFIX "boosttest")
+
+if(NOT Boost_FOUND)
+ find_package(Boost 1.34.0 QUIET)
+endif()
+if("${Boost_VERSION}0" LESS "1034000")
+ set(_shared_msg
+ "NOTE: boost::test-based targets and tests cannot "
+ "be added: boost >= 1.34.0 required but not found. "
+ "(found: '${Boost_VERSION}'; want >=103400) ")
+ if(BUILD_TESTING)
+ message(FATAL_ERROR
+ ${_shared_msg}
+ "You may disable BUILD_TESTING to continue without the "
+ "tests.")
+ else()
+ message(STATUS
+ ${_shared_msg}
+ "BUILD_TESTING disabled, so continuing anyway.")
+ endif()
+endif()
+
+include(GetForceIncludeDefinitions)
+include(CopyResourcesToBuildTree)
+
+if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
+ set(_boosttesttargets_libs)
+ set(_boostConfig "BoostTestTargetsIncluded.h")
+ if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+ find_package(Boost 1.34.0 QUIET COMPONENTS unit_test_framework)
+ endif()
+ if(Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+ set(_boosttesttargets_libs "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
+ if(Boost_USE_STATIC_LIBS)
+ set(_boostConfig "BoostTestTargetsStatic.h")
+ else()
+ if(NOT APPLE)
+ set(_boostConfig "BoostTestTargetsDynamic.h")
+ endif()
+ endif()
+ endif()
+ get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ configure_file("${_moddir}/${_boostConfig}"
+ "${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
+ COPYONLY)
+ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+
+function(add_boost_test _name)
+ if(NOT BUILD_TESTING)
+ return()
+ endif()
+ if("${CMAKE_VERSION}" VERSION_LESS "2.8.0")
+ if(NOT "${_boost_test_cmakever_pestered}x" EQUALS "${CMAKE_VERSION}x")
+ message(STATUS
+ "Not adding boost::test targets - CMake 2.8.0 or newer required, using ${CMAKE_VERSION}")
+ set(_boost_test_cmakever_pestered
+ "${CMAKE_VERSION}"
+ CACHE
+ INTERNAL
+ ""
+ FORCE)
+ endif()
+ return()
+ endif()
+
+ # parse arguments
+ set(_nowhere)
+ set(_curdest _nowhere)
+ set(_val_args
+ SOURCES
+ FAIL_REGULAR_EXPRESSION
+ LAUNCHER
+ LIBRARIES
+ RESOURCES
+ TESTS)
+ set(_bool_args
+ USE_COMPILED_LIBRARY)
+ foreach(_arg ${_val_args} ${_bool_args})
+ set(${_arg})
+ endforeach()
+ foreach(_element ${ARGN})
+ list(FIND _val_args "${_element}" _val_arg_find)
+ list(FIND _bool_args "${_element}" _bool_arg_find)
+ if("${_val_arg_find}" GREATER "-1")
+ set(_curdest "${_element}")
+ elseif("${_bool_arg_find}" GREATER "-1")
+ set("${_element}" ON)
+ set(_curdest _nowhere)
+ else()
+ list(APPEND ${_curdest} "${_element}")
+ endif()
+ endforeach()
+
+ if(_nowhere)
+ message(FATAL_ERROR "Syntax error in use of add_boost_test!")
+ endif()
+
+ if(NOT SOURCES)
+ message(FATAL_ERROR
+ "Syntax error in use of add_boost_test: at least one source file required!")
+ endif()
+
+ if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
+
+ include_directories(${Boost_INCLUDE_DIRS})
+
+ set(includeType)
+ foreach(src ${SOURCES})
+ file(READ ${src} thefile)
+ if("${thefile}" MATCHES ".*BoostTestTargetConfig.h.*")
+ set(includeType CONFIGURED)
+ set(includeFileLoc ${src})
+ break()
+ elseif("${thefile}" MATCHES ".*boost/test/included/unit_test.hpp.*")
+ set(includeType INCLUDED)
+ set(includeFileLoc ${src})
+ set(_boosttesttargets_libs) # clear this out - linking would be a bad idea
+ if(NOT
+ "${thefile}"
+ MATCHES
+ ".*OVERRIDE_BOOST_TEST_INCLUDED_WARNING.*")
+ message("Please replace the include line in ${src} with this alternate include line instead:")
+ message(" \#include <BoostTestTargetConfig.h>")
+ message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
+ endif()
+ break()
+ endif()
+ endforeach()
+
+ if(NOT _boostTestTargetsNagged${_name} STREQUAL "${includeType}")
+ if("includeType" STREQUAL "CONFIGURED")
+ message(STATUS
+ "Test '${_name}' uses the CMake-configurable form of the boost test framework - congrats! (Including File: ${includeFileLoc})")
+ elseif("${includeType}" STREQUAL "INCLUDED")
+ message("In test '${_name}': ${includeFileLoc} uses the 'included' form of the boost unit test framework.")
+ else()
+ message("In test '${_name}': Didn't detect the CMake-configurable boost test include.")
+ message("Please replace your existing boost test include in that test with the following:")
+ message(" \#include <BoostTestTargetConfig.h>")
+ message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
+ endif()
+ endif()
+ set(_boostTestTargetsNagged${_name}
+ "${includeType}"
+ CACHE
+ INTERNAL
+ ""
+ FORCE)
+
+
+ if(RESOURCES)
+ list(APPEND SOURCES ${RESOURCES})
+ endif()
+
+ # Generate a unique target name, using the relative binary dir
+ # and provided name. (transform all / into _ and remove all other
+ # non-alphabet characters)
+ file(RELATIVE_PATH
+ targetpath
+ "${CMAKE_BINARY_DIR}"
+ "${CMAKE_CURRENT_BINARY_DIR}")
+ string(REGEX REPLACE "[^A-Za-z/_]" "" targetpath "${targetpath}")
+ string(REPLACE "/" "_" targetpath "${targetpath}")
+
+ set(_target_name ${BOOST_TEST_TARGET_PREFIX}-${targetpath}-${_name})
+ set(${_name}_TARGET_NAME "${_target_name}" PARENT_SCOPE)
+
+ # Build the test.
+ add_executable(${_target_name} ${SOURCES})
+
+ list(APPEND LIBRARIES ${_boosttesttargets_libs})
+
+ if(LIBRARIES)
+ target_link_libraries(${_target_name} ${LIBRARIES})
+ endif()
+
+ if(RESOURCES)
+ set_property(TARGET ${_target_name} PROPERTY RESOURCE ${RESOURCES})
+ copy_resources_to_build_tree(${_target_name})
+ endif()
+
+ if(NOT Boost_TEST_FLAGS)
+# set(Boost_TEST_FLAGS --catch_system_error=yes --output_format=XML)
+ set(Boost_TEST_FLAGS --catch_system_error=yes)
+ endif()
+
+ # TODO: Figure out why only recent boost handles individual test running properly
+
+ if(LAUNCHER)
+ set(_test_command ${LAUNCHER} "\$<TARGET_FILE:${_target_name}>")
+ else()
+ set(_test_command ${_target_name})
+ endif()
+
+ if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
+ foreach(_test ${TESTS})
+ add_test(NAME
+ ${_name}-${_test}
+ COMMAND
+ ${_test_command}
+ --run_test=${_test}
+ ${Boost_TEST_FLAGS})
+ if(FAIL_REGULAR_EXPRESSION)
+ set_tests_properties(${_name}-${_test}
+ PROPERTIES
+ FAIL_REGULAR_EXPRESSION
+ "${FAIL_REGULAR_EXPRESSION}")
+ endif()
+ endforeach()
+ else()
+ add_test(NAME
+ ${_name}-boost_test
+ COMMAND
+ ${_test_command}
+ ${Boost_TEST_FLAGS})
+ if(FAIL_REGULAR_EXPRESSION)
+ set_tests_properties(${_name}-${_test}
+ PROPERTIES
+ FAIL_REGULAR_EXPRESSION
+ "${FAIL_REGULAR_EXPRESSION}")
+ endif()
+ endif()
+
+ # CppCheck the test if we can.
+ if(COMMAND add_cppcheck)
+ add_cppcheck(${_target_name} STYLE UNUSED_FUNCTIONS)
+ endif()
+
+ endif()
+endfunction()
Property changes on: trunk/cmake/BoostTestTargets.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BoostTestTargetsDynamic.h
===================================================================
--- trunk/cmake/BoostTestTargetsDynamic.h (rev 0)
+++ trunk/cmake/BoostTestTargetsDynamic.h 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,9 @@
+// Small header computed by CMake to set up boost test.
+// include AFTER #define BOOST_TEST_MODULE whatever
+// but before any other boost test includes.
+
+// Using the Boost UTF dynamic library
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+
Property changes on: trunk/cmake/BoostTestTargetsDynamic.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BoostTestTargetsIncluded.h
===================================================================
--- trunk/cmake/BoostTestTargetsIncluded.h (rev 0)
+++ trunk/cmake/BoostTestTargetsIncluded.h 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,7 @@
+// Small header computed by CMake to set up boost test.
+// include AFTER #define BOOST_TEST_MODULE whatever
+// but before any other boost test includes.
+
+// Using the Boost UTF included framework
+
+#include <boost/test/included/unit_test.hpp>
Property changes on: trunk/cmake/BoostTestTargetsIncluded.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BoostTestTargetsStatic.h
===================================================================
--- trunk/cmake/BoostTestTargetsStatic.h (rev 0)
+++ trunk/cmake/BoostTestTargetsStatic.h 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,7 @@
+// Small header computed by CMake to set up boost test.
+// include AFTER #define BOOST_TEST_MODULE whatever
+// but before any other boost test includes.
+
+// Using the Boost UTF static library
+
+#include <boost/test/unit_test.hpp>
Property changes on: trunk/cmake/BoostTestTargetsStatic.h
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BundleOSGPlugins.cmake
===================================================================
--- trunk/cmake/BundleOSGPlugins.cmake (rev 0)
+++ trunk/cmake/BundleOSGPlugins.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,83 @@
+# - Provide access to the OpenSceneGraph runtime files for bundling in
+# an installation or package.
+#
+# Sets these variables:
+# - OSGDB_PLUGINS_RELEASE
+# - OSGDB_PLUGINS_DEBUG
+# - OSGWRAPPER_PLUGINS_RELEASE
+# - OSGWRAPPER_PLUGINS_DEBUG
+# - OSG_RUNTIME_LIBRARY_DIR
+# - OSG_PATH_TO_PLUGINS
+#
+# Creates this function:
+# - install_osg_plugins( {varNameForOutputFilenames} )
+#
+# Requires these CMake modules:
+# no additional modules required
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+
+function(_osgbundle_split_debug_versions releasevar debugvar)
+ set(release)
+ set(debug)
+ foreach(fn ${ARGN})
+ get_filename_component(name "${fn}" NAME_WE)
+ if(${name} MATCHES "d$")
+ list(APPEND debug "${fn}")
+ else()
+ list(APPEND release "${fn}")
+ endif()
+ endforeach()
+ set(${releasevar} ${release} PARENT_SCOPE)
+ set(${debugvar} ${debug} PARENT_SCOPE)
+endfunction()
+
+function(_osgbundle_find_plugins varprefix filenameprefix)
+ file(GLOB
+ all
+ "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
+ ${varprefix}_PLUGINS_DEBUG
+ ${all})
+ set(${varprefix}_PLUGINS_RELEASE
+ "${${varprefix}_PLUGINS_RELEASE}"
+ PARENT_SCOPE)
+ set(${varprefix}_PLUGINS_DEBUG
+ "${${varprefix}_PLUGINS_DEBUG}"
+ PARENT_SCOPE)
+endfunction()
+
+if(OPENSCENEGRAPH_FOUND)
+ if(WIN32)
+ get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
+ get_filename_component(_osgroot "${_osglibdir}/.." ABSOLUTE)
+ set(OSG_RUNTIME_LIBRARY_DIR "${_osgroot}/bin")
+ set(OSG_PATH_TO_PLUGINS "bin/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
+ else()
+ get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
+ set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
+ set(OSG_PATH_TO_PLUGINS "lib/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
+ endif()
+ # Find the osgDB plugins
+ _osgbundle_find_plugins(OSGDB osgdb)
+ _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
+endif()
+
+function(install_osg_plugins var)
+ set(INSTALLEDPLUGINS)
+ foreach(plugin ${OSGDB_PLUGINS_RELEASE} ${OSGWRAPPER_PLUGINS_RELEASE})
+ install(FILES "${plugin}" DESTINATION "${OSG_PATH_TO_PLUGINS}")
+ get_filename_component(name "${plugin}" NAME)
+ list(APPEND INSTALLEDPLUGINS "${OSG_PATH_TO_PLUGINS}/${name}")
+ endforeach()
+ set(${var} ${INSTALLEDPLUGINS} PARENT_SCOPE)
+endfunction()
Property changes on: trunk/cmake/BundleOSGPlugins.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BundleOSGRuntime.cmake
===================================================================
--- trunk/cmake/BundleOSGRuntime.cmake (rev 0)
+++ trunk/cmake/BundleOSGRuntime.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,118 @@
+# - Include the OpenSceneGraph runtime files in an installation or built package.
+#
+# OSGRUNTIME_BUNDLE - Set to "yes" to enable this behavior
+# OSGRUNTIME_zlib1dll - Must be set to the location of zlib1.dll on Windows
+# OSGRUNTIME_zlib1ddll - Can be set to the location of zlib1d.dll (debug) on Windows.
+# If set, will be installed.
+#
+# Requires these CMake modules:
+# no additional modules required
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+function(_osgbundle_split_debug_versions releasevar debugvar)
+ set(release)
+ set(debug)
+ foreach(fn ${ARGN})
+ get_filename_component(name "${fn}" NAME_WE)
+ if(${name} MATCHES "d$")
+ list(APPEND debug "${fn}")
+ else()
+ list(APPEND release "${fn}")
+ endif()
+ endforeach()
+ set(${releasevar} ${release} PARENT_SCOPE)
+ set(${debugvar} ${debug} PARENT_SCOPE)
+endfunction()
+
+function(_osgbundle_find_plugins varprefix filenameprefix)
+ file(GLOB
+ all
+ "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
+ ${varprefix}_PLUGINS_DEBUG
+ ${all})
+endfunction()
+
+if(OPENSCENEGRAPH_FOUND)
+ if(WIN32)
+ get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
+ get_filename_component(_osgroot "${_osglibdir}/.." ABSOLUTE)
+ set(OSG_RUNTIME_LIBRARY_DIR "${_osgroot}/bin")
+ find_file(OSGBUNDLE_zlib1dll
+ zlib1.dll
+ PATHS
+ "${_osgroot}/bin"
+ "${_osgroot}/lib")
+ find_file(OSGBUNDLE_zlib1ddll
+ zlib1d.dll
+ PATHS
+ "${_osgroot}/bin"
+ "${_osgroot}/lib")
+ mark_as_advanced(OSGBUNDLE_zlib1dll OSGBUNDLE_zlib1ddll)
+ set(_osgbundle_required OSGBUNDLE_zlib1dll)
+ set(_osgbundle_platformOK on)
+ else()
+ get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
+ set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
+ set(_osgbundle_platformOK on)
+ endif()
+
+ # Find the osgDB plugins
+
+ _osgbundle_find_plugins(OSGDB osgdb)
+ _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
+endif()
+
+
+
+if(_osgbundle_platformOK)
+ set(_osgbundle_caninstall on)
+ foreach(_var ${_osgbundle_required})
+ if(NOT ${_var})
+ # If we are missing a single required file, cut out now.
+ set(_osgbundle_caninstall off)
+ option(OSGRUNTIME_BUNDLE
+ "Install a local copy of the OpenSceneGraph runtime files with the project."
+ off)
+ endif()
+ endforeach()
+ if(_osgbundle_caninstall)
+ option(OSGRUNTIME_BUNDLE
+ "Install a local copy of the OpenSceneGraph runtime files with the project."
+ on)
+ endif()
+endif()
+
+mark_as_advanced(OSGRUNTIME_BUNDLE)
+
+if(OSGRUNTIME_BUNDLE AND OPENSCENEGRAPH_FOUND AND _osgbundle_caninstall)
+ if(WIN32)
+ set(DESTINATION bin)
+ install(FILES "${OSGBUNDLE_zlib1dll}"
+ DESTINATION ${DESTINATION})
+
+ if(OSGBUNDLE_zlib1ddll)
+ install(FILES "${OSGBUNDLE_zlib1ddll}"
+ DESTINATION ${DESTINATION})
+ endif()
+
+ else()
+ set(DESTINATION lib)
+ endif()
+
+ install(DIRECTORY "${_osgroot}/bin/" "${_osgroot}/lib/"
+ DESTINATION ${DESTINATION}
+ FILES_MATCHING
+
+ # Runtime files
+ PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+endif()
Property changes on: trunk/cmake/BundleOSGRuntime.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BundleVRJ22Runtime.cmake
===================================================================
--- trunk/cmake/BundleVRJ22Runtime.cmake (rev 0)
+++ trunk/cmake/BundleVRJ22Runtime.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,99 @@
+# - Include the VR Juggler runtime files in an installation or built package.
+#
+# VRJUGGLERRUNTIME_BUNDLE
+# VRJUGGLERRUNTIME_BUNDLE_DEBUG - set to yes to include debug dll's as well
+#
+# Requires these CMake modules:
+# FindVRJuggler22 and its dependencies
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(WIN32)
+ option(VRJUGGLERRUNTIME_BUNDLE
+ "Install a local copy of the VR Juggler runtime files with the project."
+ on)
+ option(VRJUGGLERRUNTIME_BUNDLE_DEBUG
+ "Install the VR Juggler debug runtime files as well."
+ off)
+ mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
+else()
+ # TODO - how to handle when not on Windows?
+ #option(VRJUGGLERRUNTIME_BUNDLE "Install a local copy of the VR Juggler runtime files with the project." off)
+endif()
+
+mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE VRJUGGLERRUNTIME_BUNDLE_DEBUG)
+
+if(VRJUGGLERRUNTIME_BUNDLE AND VRJUGGLER22_FOUND)
+ if(WIN32)
+ get_filename_component(_vrjlibdir "${VRJ22_LIBRARY_RELEASE}" PATH)
+ get_filename_component(_vrjroot "${_vrjlibdir}/../" ABSOLUTE)
+
+ # TODO - make sure gadgeteer and sonix can find their DSO's at runtime...
+
+ foreach(_dir bin lib)
+ if(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
+ install(DIRECTORY "${_vrjroot}/${_dir}/"
+ DESTINATION bin
+ PATTERN "*.lib" EXCLUDE # exclude static and link libraries
+ PATTERN "*.exe" EXCLUDE # exclude unneeded executables
+ PATTERN "*.py" EXCLUDE # exclude unneeded python executables
+ PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
+ )
+ else()
+ install(DIRECTORY ${_vrjroot}/${_dir}/
+ DESTINATION bin
+ PATTERN "*.lib" EXCLUDE # exclude static and link libraries
+ PATTERN "*.exe" EXCLUDE # exclude unneeded executables
+ PATTERN "*.py" EXCLUDE # exclude unneeded python executables
+ PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
+
+ PATTERN "*d.dll" EXCLUDE # exclude debug dll's
+ PATTERN "*-gd-*.dll" EXCLUDE # exclude Boost debug dll's
+ )
+ endif()
+
+ endforeach()
+
+ install(DIRECTORY ${_vrjroot}/share/
+ DESTINATION share
+ FILES_MATCHING
+
+ # Runtime files
+ PATTERN "*.dll"
+ PATTERN "*.jar"
+
+ # Data files
+ PATTERN "*.wav"
+ PATTERN "*.xml"
+ PATTERN "*.xsl"
+ PATTERN "*.xsd"
+ PATTERN "*.flt"
+ PATTERN "*.dat"
+ PATTERN "*.table"
+
+
+ # Config files
+ PATTERN "*.jdef"
+ PATTERN "*.jconf"
+ PATTERN "*.cfg"
+ PATTERN "hosts.allow"
+
+ # Other Files
+ PATTERN "*.txt"
+ PATTERN "COPYING*"
+ PATTERN "ChangeLog"
+ )
+
+ endif()
+
+
+
+endif()
Property changes on: trunk/cmake/BundleVRJ22Runtime.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/BundleVRJ30Runtime.cmake
===================================================================
--- trunk/cmake/BundleVRJ30Runtime.cmake (rev 0)
+++ trunk/cmake/BundleVRJ30Runtime.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,96 @@
+# - Include the VR Juggler runtime files in an installation or built package.
+#
+# VRJUGGLERRUNTIME_BUNDLE
+# VRJUGGLERRUNTIME_BUNDLE_DEBUG - set to yes to include debug dll's as well
+#
+# Requires these CMake modules:
+# FindVRJuggler22 and its dependencies
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+# Updated for VR Juggler 3.0 by:
+# Brandon Newendorp <br...@ne...>
+
+if(WIN32)
+ option(VRJUGGLERRUNTIME_BUNDLE
+ "Install a local copy of the VR Juggler runtime files with the project."
+ on)
+ option(VRJUGGLERRUNTIME_BUNDLE_DEBUG
+ "Install the VR Juggler debug runtime files as well."
+ off)
+ mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
+else()
+ # TODO - how to handle when not on Windows?
+ #option(VRJUGGLERRUNTIME_BUNDLE "Install a local copy of the VR Juggler runtime files with the project." off)
+endif()
+
+mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE VRJUGGLERRUNTIME_BUNDLE_DEBUG)
+
+if(VRJUGGLERRUNTIME_BUNDLE AND VRJUGGLER22_FOUND)
+ if(WIN32)
+ get_filename_component(_vrjlibdir "${VRJ22_LIBRARY_RELEASE}" PATH)
+ get_filename_component(_vrjroot "${_vrjlibdir}/../" ABSOLUTE)
+
+ # TODO - make sure gadgeteer and sonix can find their DSO's at runtime...
+
+ foreach(_dir bin lib)
+ if(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
+ install(DIRECTORY "${_vrjroot}/${_dir}/"
+ DESTINATION bin
+ PATTERN "*.lib" EXCLUDE # exclude static and link libraries
+ PATTERN "*.exe" EXCLUDE # exclude unneeded executables
+ PATTERN "*.py" EXCLUDE # exclude unneeded python executables
+ PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
+ )
+ else()
+ install(DIRECTORY ${_vrjroot}/${_dir}/
+ DESTINATION bin
+ PATTERN "*.lib" EXCLUDE # exclude static and link libraries
+ PATTERN "*.exe" EXCLUDE # exclude unneeded executables
+ PATTERN "*.py" EXCLUDE # exclude unneeded python executables
+ PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
+
+ PATTERN "*d.dll" EXCLUDE # exclude debug dll's
+ PATTERN "*-gd-*.dll" EXCLUDE # exclude Boost debug dll's
+ )
+ endif()
+
+ endforeach()
+
+ install(DIRECTORY ${_vrjroot}/share/
+ DESTINATION share
+ FILES_MATCHING
+
+ # Runtime files
+ PATTERN "*.dll"
+ PATTERN "*.jar"
+
+ # Data files
+ PATTERN "*.wav"
+ PATTERN "*.xml"
+ PATTERN "*.xsl"
+ PATTERN "*.xsd"
+ PATTERN "*.flt"
+ PATTERN "*.dat"
+ PATTERN "*.table"
+
+
+ # Config files
+ PATTERN "*.jdef"
+ PATTERN "*.jconf"
+ PATTERN "*.cfg"
+ PATTERN "hosts.allow"
+
+ # Other Files
+ PATTERN "*.txt"
+ PATTERN "COPYING*"
+ PATTERN "ChangeLog"
+ )
+
+ endif()
+
+
+
+endif()
Property changes on: trunk/cmake/BundleVRJ30Runtime.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CheckMacHIDAPI.cmake
===================================================================
--- trunk/cmake/CheckMacHIDAPI.cmake (rev 0)
+++ trunk/cmake/CheckMacHIDAPI.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,73 @@
+# - Script to check if the signature for a mac HID callback uses UInt32 or uint32_t
+# Requires that the associated CPP file be present: CheckMacHIDAPI.cpp.
+#
+# MACOSX_HID_UINT32T, set according to the results of our test.
+#
+# Use add_definitions(-DMACOSX_HID_UINT32T=${MACOSX_HID_UINT32T}) in your
+# listfile and the following prototype for the function you'd like to
+# register using setInterruptReportHandlerCallback:
+# void ReaderReportCallback(
+# void *target,
+# IOReturn result,
+# void *refcon,
+# void *sender,
+# MACOSX_HID_UINT32T size
+# )
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+
+if(APPLE)
+ if(NOT MACOSX_HID_UINT32T)
+ get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+ try_compile(_HID_uint32t
+ ${CMAKE_BINARY_DIR}
+ ${_moddir}/CheckMacHIDAPI.cpp
+ OUTPUT_VARIABLE
+ _HID_uint32t_OUTPUT
+ COMPILE_DEFINITIONS
+ -DMACOSX_HID_UINT32T=uint32_t)
+ message(STATUS
+ "Checking uint32_t in HID callback signature... ${_HID_uint32t}")
+
+ try_compile(_HID_UInt32
+ ${CMAKE_BINARY_DIR}
+ ${_moddir}/CheckMacHIDAPI.cpp
+ OUTPUT_VARIABLE
+ _HID_UInt32_OUTPUT
+ COMPILE_DEFINITIONS
+ -DMACOSX_HID_UINT32T=UInt32)
+ message(STATUS
+ "Checking UInt32 in HID callback signature... ${_HID_UInt32}")
+
+
+ if(_HID_uint32t)
+ set(MACOSX_HID_UINT32T
+ "uint32_t"
+ CACHE
+ STRING
+ "The 32-bit uint type desired in the callback set by setInterruptReportHandlerCallback")
+ mark_as_advanced(MACOSX_HID_UINT32T)
+ elseif(_HID_UInt32)
+ set(MACOSX_HID_UINT32T
+ "UInt32"
+ CACHE
+ STRING
+ "The 32-bit uint type desired in the callback set by setInterruptReportHandlerCallback")
+ mark_as_advanced(MACOSX_HID_UINT32T)
+ else()
+ message(SEND_ERROR
+ "ERROR: Could not detect appropriate Mac HID uint32 type!")
+ endif()
+
+ endif()
+endif()
Property changes on: trunk/cmake/CheckMacHIDAPI.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CheckMacHIDAPI.cpp
===================================================================
--- trunk/cmake/CheckMacHIDAPI.cpp (rev 0)
+++ trunk/cmake/CheckMacHIDAPI.cpp 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,47 @@
+/**
+ * \file CheckMacHIDAPI.cpp
+ * \brief C++ source file used by CMake module CheckMacHIDAPI.cmake
+ *
+ * \author
+ * Ryan Pavlik, 2009-2010
+ * <rp...@ia...>
+ * http://academic.cleardefinition.com/
+ *
+ * \author
+ * Based on code extracted from VRPN 07.22 for use as a minimal test case
+ *
+ * Attempts to compile a difficult bit of code against the Mac
+ * HID API, as two different types have been required in the callback
+ * function (UInt32 and uint32_t) and testing is the best way to know
+ * which one is correct for a given system.
+ *
+ */
+
+
+#if defined(__APPLE__)
+
+#include <stdio.h>
+#include <IOKit/IOCFPlugIn.h>
+#include <IOKit/hid/IOHIDLib.h>
+#include <IOKit/hid/IOHIDKeys.h>
+#include <CoreFoundation/CoreFoundation.h>
+void ReaderReportCallback(
+ void *target, IOReturn result, void *refcon, void *sender, MACOSX_HID_UINT32T size
+ )
+ {}
+#endif
+
+int main(int argc, char* argv[]) {
+#if defined(__APPLE__)
+ io_object_t _ioObject;
+ IOHIDDeviceInterface122 **_interface;
+ bool _gotdata;
+ int _gotsize;
+ unsigned char _buffer[512];
+ IOReturn result = (*_interface)->setInterruptReportHandlerCallback(_interface,
+ _buffer, 512,
+ ReaderReportCallback,
+ NULL, 0);
+#endif
+ return 0;
+}
Property changes on: trunk/cmake/CheckMacHIDAPI.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CheckVersion.cmake
===================================================================
--- trunk/cmake/CheckVersion.cmake (rev 0)
+++ trunk/cmake/CheckVersion.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,47 @@
+# - Utility function for Find modules considering multiple possible versions
+#
+# Requires these CMake modules:
+# no additional modules required
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__check_version)
+ return()
+endif()
+set(__check_version YES)
+
+function(check_version var packagename version)
+ # By default, we say that the version is good enough
+ set(_result TRUE)
+
+ # Was a version requested? If so, what is our test condition?
+ if(${packagename}_FIND_VERSION)
+ if(${packagename}_FIND_VERSION_EXACT)
+ # Yes, an exact == version was requested - check it.
+
+ if(NOT "${version}" VERSION_EQUAL "${${packagename}_FIND_VERSION}")
+ # version is not an exact match
+ set(_result FALSE)
+ endif()
+ else()
+ # Yes, a minimum >= version was requested - check it.
+
+ if("${version}" VERSION_LESS "${${packagename}_FIND_VERSION}")
+ # version is lower than requested
+ set(_result FALSE)
+ endif()
+
+ endif()
+ endif()
+
+ # Return _result
+ set(${var} ${_result} PARENT_SCOPE)
+endfunction()
Property changes on: trunk/cmake/CheckVersion.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CleanDirectoryList.cmake
===================================================================
--- trunk/cmake/CleanDirectoryList.cmake (rev 0)
+++ trunk/cmake/CleanDirectoryList.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,48 @@
+# - Removes duplicate entries and non-directories from a provided list
+#
+# clean_directory_list(<listvar> [<additional list items>...])
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__clean_directory_list)
+ return()
+endif()
+set(__clean_directory_list YES)
+
+function(clean_directory_list _var)
+ # combine variable's current value with additional list items
+ set(_in ${${_var}} ${ARGN})
+
+ if(_in)
+ # Initial list cleaning
+ list(REMOVE_DUPLICATES _in)
+
+ # Grab the absolute path of each actual directory
+ set(_out)
+ foreach(_dir ${_in})
+ if(IS_DIRECTORY "${_dir}")
+ get_filename_component(_dir "${_dir}" ABSOLUTE)
+ file(TO_CMAKE_PATH "${_dir}" _dir)
+ list(APPEND _out "${_dir}")
+ endif()
+ endforeach()
+
+ if(_out)
+ # Clean up the output list now
+ list(REMOVE_DUPLICATES _out)
+ endif()
+
+ # return _out
+ set(${_var} "${_out}" PARENT_SCOPE)
+ endif()
+endfunction()
Property changes on: trunk/cmake/CleanDirectoryList.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CleanLibraryList.cmake
===================================================================
--- trunk/cmake/CleanLibraryList.cmake (rev 0)
+++ trunk/cmake/CleanLibraryList.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,72 @@
+# - A smarter replacement for list(REMOVE_DUPLICATES) for library lists
+#
+# Note that, in the case of cyclic link dependencies, you _do_ actually need
+# a library in a list multiple times. So, only use this function when you know
+# that the dependency graph is acyclic.
+#
+# clean_library_list(<listvar> [<additional list items>...]) - where
+# listvar is the name of a destination variable, and also possibly a source, and
+# it is followed by any number (including 0) of additional libraries to append
+# to the list before processing.
+#
+# Removes duplicates from the list, leaving only the last instance, while
+# preserving the meaning of the "optimized", "debug", and "general" labeling.
+# (Libraries listed as general are listed in the result instead as optimized and
+# debug)
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__clean_library_list)
+ return()
+endif()
+set(__clean_library_list YES)
+
+function(clean_library_list _var)
+ # combine variable's current value with additional list items
+ set(_work ${${_var}} ${ARGN})
+ if(_work)
+ # Turn each of optimized, debug, and general into flags
+ # prefixed on their respective library (combining list items)
+ string(REGEX REPLACE "optimized;" "1CLL%O%" _work "${_work}")
+ string(REGEX REPLACE "debug;" "1CLL%D%" _work "${_work}")
+ string(REGEX REPLACE "general;" "1CLL%G%" _work "${_work}")
+
+ # Any library that doesn't have a prefix is general, and a general
+ # library is both debug and optimized so stdize it
+ set(_std)
+ foreach(_lib ${_work})
+ if(NOT "${_lib}" MATCHES "^1CLL%.%")
+ list(APPEND _std "1CLL%D%${_lib}" "1CLL%O%${_lib}")
+ elseif("${_lib}" MATCHES "^1CLL%G%")
+ string(REPLACE "1CLL%G%" "" _justlib "${_lib}")
+ list(APPEND _std "1CLL%D%${_justlib}" "1CLL%O%${_justlib}")
+ else()
+ list(APPEND _std "${_lib}")
+ endif()
+ endforeach()
+
+ # REMOVE_DUPLICATES leaves the first - so we reverse before and after
+ # to keep the last, instead
+ list(REVERSE _std)
+ list(REMOVE_DUPLICATES _std)
+ list(REVERSE _std)
+
+ # Split list items back out again: turn prefixes into the
+ # library type flags.
+ string(REGEX REPLACE "1CLL%D%" "debug;" _std "${_std}")
+ string(REGEX REPLACE "1CLL%O%" "optimized;" _std "${_std}")
+
+ # Return _std
+ set(${_var} ${_std} PARENT_SCOPE)
+ endif()
+endfunction()
Property changes on: trunk/cmake/CleanLibraryList.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CopyResourcesToBuildTree.cmake
===================================================================
--- trunk/cmake/CopyResourcesToBuildTree.cmake (rev 0)
+++ trunk/cmake/CopyResourcesToBuildTree.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,83 @@
+# - Copy the resources your app needs to the build tree.
+#
+# copy_resources_to_build_tree(<target_name>)
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__copy_resources_to_build_tree)
+ return()
+endif()
+set(__copy_resources_to_build_tree YES)
+
+function(copy_resources_to_build_tree _target)
+ get_target_property(_resources ${_target} RESOURCE)
+ if(NOT _resources)
+ # Bail if no resources
+ message(STATUS
+ "Told to copy resources for target ${_target}, but "
+ "no resources are set!")
+ return()
+ endif()
+
+ get_target_property(_path ${_target} LOCATION)
+ get_filename_component(_path "${_path}" PATH)
+
+ if(NOT MSVC AND NOT "${CMAKE_GENERATOR}" MATCHES "Makefiles")
+ foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+ get_target_property(_path${_config} ${_target} LOCATION_${_config})
+ get_filename_component(_path${_config} "${_path${_config}}" PATH)
+ add_custom_command(TARGET ${_target}
+ POST_BUILD
+ COMMAND
+ ${CMAKE_COMMAND}
+ ARGS -E make_directory "${_path${_config}}/"
+ COMMENT "Creating directory ${_path${_config}}/")
+ endforeach()
+ endif()
+
+ foreach(_res ${_resources})
+ if(NOT IS_ABSOLUTE "${_res}")
+ get_filename_component(_res "${_res}" ABSOLUTE)
+ endif()
+ get_filename_component(_name "${_res}" NAME)
+
+ if(MSVC)
+ # Working dir is solution file dir, not exe file dir.
+ add_custom_command(TARGET ${_target}
+ POST_BUILD
+ COMMAND
+ ${CMAKE_COMMAND}
+ ARGS -E copy "${_res}" "${CMAKE_BINARY_DIR}/"
+ COMMENT "Copying ${_name} to ${CMAKE_BINARY_DIR}/ for MSVC")
+ else()
+ if("${CMAKE_GENERATOR}" MATCHES "Makefiles")
+ add_custom_command(TARGET ${_target}
+ POST_BUILD
+ COMMAND
+ ${CMAKE_COMMAND}
+ ARGS -E copy "${_res}" "${_path}/"
+ COMMENT "Copying ${_name} to ${_path}/")
+ else()
+ foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+ add_custom_command(TARGET ${_target}
+ POST_BUILD
+ COMMAND
+ ${CMAKE_COMMAND}
+ ARGS -E copy "${_res}" "${_path${_config}}"
+ COMMENT "Copying ${_name} to ${_path${_config}}")
+ endforeach()
+
+ endif()
+ endif()
+ endforeach()
+endfunction()
Property changes on: trunk/cmake/CopyResourcesToBuildTree.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cmake/CppcheckTargets.cmake
===================================================================
--- trunk/cmake/CppcheckTargets.cmake (rev 0)
+++ trunk/cmake/CppcheckTargets.cmake 2012-07-04 20:30:43 UTC (rev 690)
@@ -0,0 +1,213 @@
+# - Run cppcheck on c++ source files as a custom target and a test
+#
+# include(CppcheckTargets)
+# add_cppcheck(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FAIL_ON_WARNINGS]) -
+# Create a target to check a target's sources with cppcheck and the indicated options
+# add_cppcheck_sources(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FAIL_ON_WARNINGS]) -
+# Create a target to check standalone sources with cppcheck and the indicated options
+#
+# Requires these CMake modules:
+# Findcppcheck
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__add_cppcheck)
+ return()
+endif()
+set(__add_cppcheck YES)
+
+if(NOT CPPCHECK_FOUND)
+ find_package(cppcheck QUIET)
+endif()
+
+if(CPPCHECK_FOUND)
+ if(NOT TARGET all_cppcheck)
+ add_custom_target(all_cppcheck)
+ set_target_properties(all_cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ endif()
+endif()
+
+function(add_cppcheck_sources _targetname)
+ if(CPPCHECK_FOUND)
+ set(_cppcheck_args)
+ set(_input ${ARGN})
+ list(FIND _input UNUSED_FUNCTIONS _unused_func)
+ if("${_unused_func}" GREATER "-1")
+ list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG})
+ list(REMOVE_AT _input ${_unused_func})
+ endif()
+
+ list(FIND _input STYLE _style)
+ if("${_style}" GREATER "-1")
+ list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG})
+ list(REMOVE_AT _input ${_style})
+ endif()
+
+ list(FIND _input POSSIBLE_ERROR _poss_err)
+ if("${_poss_err}" GREATER "-1")
+ list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG})
+ list(REMOVE_AT _input ${_poss_err})
+ endif()
+
+ list(FIND _input FAIL_ON_WARNINGS _fail_on_warn)
+ if("${_fail_on_warn}" GREATER "-1")
+ list(APPEND
+ CPPCHECK_FAIL_REGULAR_EXPRESSION
+ ${CPPCHECK_WARN_REGULAR_EXPRESSION})
+ list(REMOVE_AT _input ${_fail_on_warn})
+ endif()
+
+ set(_files)
+ foreach(_source ${_input})
+ get_source_file_property(_cppcheck_loc "${_source}" LOCATION)
+ if(_cppcheck_loc)
+ # This file has a source file property, carry on.
+ get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE)
+ if("${_cppcheck_lang}" MATCHES "CXX")
+ list(APPEND _files "${_cppcheck_loc}")
+ endif()
+ else()
+ # This file doesn't have source file properties - figure it out.
+ get_filename_component(_cppcheck_loc "${_source}" ABSOLUTE)
+ if(EXISTS "${_cppcheck_loc}")
+ list(APPEND _files "${_cppcheck_loc}")
+ else()
+ message(FATAL_ERROR
+ "Adding CPPCHECK for file target ${_targetname}: "
+ "File ${_source} does not exist or needs a corrected path location "
+ "since we think its absolute path is ${_cppcheck_loc}")
+ endif()
+ endif()
+ endforeach()
+
+ if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
+ # Older than CMake 2.8.0
+ add_test(${_targetname}_cppcheck_test
+ "${CPPCHECK_EXECUTABLE}"
+ ${CPPCHECK_TEMPLATE_ARG}
+ ${_cppcheck_args}
+ ${_files})
+ else()
+ # CMake 2.8.0 and newer
+ add_test(NAME
+ ${_targetname}_cppcheck_test
+ COMMAND
+ "${CPPCHECK_EXECUTABLE}"
+ ${CPPCHECK_TEMPLATE_ARG}
+ ${_cppcheck_args}
+ ${_files})
+ endif()
+
+ set_tests_properties(${_targetname}_cppcheck_test
+ PROPERTIES
+ FAIL_REGULAR_EXPRESSION
+ "${CPPCHECK_FAIL_REGULAR_EXPRESSION}")
+
+ add_custom_command(TARGET
+ all_cppcheck
+ PRE_BUILD
+ COMMAND
+ ${CPPCHECK_EXECUTABLE}
+ ${CPPCHECK_QUIET_ARG}
+ ${CPPCHECK_TEMPLATE_ARG}
+ ${_cppcheck_args}
+ ${_files}
+ WORKING_DIRECTORY
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ COMMENT
+ "${_targetname}_cppcheck: Running cppcheck on target ${_targetname}..."
+ VERBATIM)
+ endif()
+endfunction()
+
+function(add_cppcheck _name)
+ if(NOT TARGET ${_name})
+ message(FATAL_ERROR
+ "add_cppcheck given a target name that does not exist: '${_name}' !")
+ endif()
+ if(CPPCHECK_FOUND)
+ set(_cppcheck_args)
+
+ list(FIND ARGN UNUSED_FUNCTIONS _unused_func)
+ if("${_unused_func}" GREATER "-1")
+ list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG})
+ endif()
+
+ list(FIND ARGN STYLE _style)
+ if("${_style}" GREATER "-1")
+ list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG})
+ endif()
+
+ list(FIND ARGN POSSIBLE_ERROR _poss_err)
+ if("${_poss_err}" GREATER "-1")
+ list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG})
+ endif()
+
+ list(FIND _input FAIL_ON_WARNINGS _fail_on_warn)
+ if("${_fail_on_warn}" GREATER "-1")
+ list(APPEND
+ CPPCHECK_FAIL_REGULAR_EXPRESSION
+ ${CPPCHECK_WARN_REGULAR_EXPRESSION})
+ list(REMOVE_AT _input ${_unused_func})
+ endif()
+
+ get_target_property(_cppcheck_sources "${_name}" SOURCES)
+ set(_files)
+ foreach(_source ${_cppcheck_sources})
+ get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE)
+ get_source_file_property(_cppcheck_loc "${_source}" LOCATION)
+ if("${_cppcheck_lang}" M...
[truncated message content] |
|
From: <pat...@us...> - 2012-07-27 22:21:36
|
Revision: 694
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=694&view=rev
Author: patrickh
Date: 2012-07-27 22:21:26 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Remove unneeded CMake stuff.
Submitted by: Doug McCorkle
Modified Paths:
--------------
trunk/CMakeLists.txt
Removed Paths:
-------------
trunk/cmake/BoostTestTargets.cmake
trunk/cmake/BoostTestTargetsDynamic.h
trunk/cmake/BoostTestTargetsIncluded.h
trunk/cmake/BoostTestTargetsStatic.h
trunk/cmake/BundleOSGPlugins.cmake
trunk/cmake/BundleOSGRuntime.cmake
trunk/cmake/BundleVRJ22Runtime.cmake
trunk/cmake/BundleVRJ30Runtime.cmake
trunk/cmake/CheckMacHIDAPI.cmake
trunk/cmake/CheckMacHIDAPI.cpp
trunk/cmake/CheckVersion.cmake
trunk/cmake/CleanDirectoryList.cmake
trunk/cmake/CleanLibraryList.cmake
trunk/cmake/CppcheckTargets.cmake
trunk/cmake/CreateDashboardScripts.cmake
trunk/cmake/CreateImportedTarget.cmake
trunk/cmake/CreateLaunchers.cmake
trunk/cmake/DashboardScript.cmake.in
trunk/cmake/DoxygenTargets.cmake
trunk/cmake/DoxygenTargets.doxyfile.in
trunk/cmake/EnableExtraCompilerWarnings.cmake
trunk/cmake/EnableProfiling.cmake
trunk/cmake/FileCopyTargets.cmake
trunk/cmake/FindALUT.cmake
trunk/cmake/FindBluez.cmake
trunk/cmake/FindDCubed.cmake
trunk/cmake/FindFlagpoll.cmake
trunk/cmake/FindGDB.cmake
trunk/cmake/FindGHOST.cmake
trunk/cmake/FindGLUI.cmake
trunk/cmake/FindGLUT.cmake
trunk/cmake/FindGMTL.cmake
trunk/cmake/FindGPM.cmake
trunk/cmake/FindGadgeteer12.cmake
trunk/cmake/FindGadgeteer20.cmake
trunk/cmake/FindGlove5DT.cmake
trunk/cmake/FindHIDAPI.cmake
trunk/cmake/FindJCCL12.cmake
trunk/cmake/FindJCCL14.cmake
trunk/cmake/FindJtTk.cmake
trunk/cmake/FindJtTk.stampkey.cmake.in
trunk/cmake/FindLAPACKLibs.cmake
trunk/cmake/FindLibusb1.cmake
trunk/cmake/FindLuabind.cmake
trunk/cmake/FindLyX.cmake
trunk/cmake/FindMacHID.cmake
trunk/cmake/FindOpenCV.cmake
trunk/cmake/FindOpenHaptics.cmake
trunk/cmake/FindOpenHaptics.cpp
trunk/cmake/FindParasolid.cmake
trunk/cmake/FindSonix12.cmake
trunk/cmake/FindSonix14.cmake
trunk/cmake/FindTR1.cmake
trunk/cmake/FindTooN.cmake
trunk/cmake/FindTooNtag.cmake
trunk/cmake/FindTweek12.cmake
trunk/cmake/FindTweek14.cmake
trunk/cmake/FindVPR20.cmake
trunk/cmake/FindVPR22.cmake
trunk/cmake/FindVPS.cmake
trunk/cmake/FindVRJ22.cmake
trunk/cmake/FindVRJ30.cmake
trunk/cmake/FindVRJOGL22.cmake
trunk/cmake/FindVRJOGL30.cmake
trunk/cmake/FindVRJuggler.cmake
trunk/cmake/FindVRJuggler22.cmake
trunk/cmake/FindVRJuggler30.cmake
trunk/cmake/FindVRPN.cmake
trunk/cmake/FindVirtuoseAPI.cmake
trunk/cmake/FindVirtuoseVPP.cmake
trunk/cmake/FindWiiSCAAT.cmake
trunk/cmake/FindWiiUse.cmake
trunk/cmake/FindWinHID.cmake
trunk/cmake/Findargp.cmake
trunk/cmake/Findcppcheck.cmake
trunk/cmake/Findcppcheck.cpp
trunk/cmake/Findcutil.cmake
trunk/cmake/Finddb2pdf.cmake
trunk/cmake/FindosgLua.cmake
trunk/cmake/Findquatlib.cmake
trunk/cmake/GetCPUDetails.cmake
trunk/cmake/GetCompilerInfoString.cmake
trunk/cmake/GetDirectoryList.cmake
trunk/cmake/GetFileList.cmake
trunk/cmake/GetForceIncludeDefinitions.cmake
trunk/cmake/GetGitRevisionDescription.cmake
trunk/cmake/GetGitRevisionDescription.cmake.in
trunk/cmake/GetSubprojectStatus.cmake
trunk/cmake/LICENSE_1_0.txt
trunk/cmake/Licensing.cmake
trunk/cmake/ListCombinations.cmake
trunk/cmake/ListFilter.cmake
trunk/cmake/LuaTargets.cmake
trunk/cmake/MSVCMultipleProcessCompile.cmake
trunk/cmake/MSVCStaticRuntime.cmake
trunk/cmake/MSVCVerboseLinking.cmake
trunk/cmake/MakeVRJugglerAppBundle.cmake
trunk/cmake/MakeVRJugglerAppBundle30.cmake
trunk/cmake/OptionRequires.cmake
trunk/cmake/PrefixListGlob.cmake
trunk/cmake/ProgramFilesGlob.cmake
trunk/cmake/README.markdown
trunk/cmake/ResetConfigurations.cmake
trunk/cmake/SearchProgramFilesForOpenSceneGraph.cmake
trunk/cmake/SetDefaultBuildType.cmake
trunk/cmake/SplitLibraryList.cmake
trunk/cmake/StampSourcesWithVersion.cmake
trunk/cmake/StampSourcesWithVersion.sed.in
trunk/cmake/TCHARWorkaround.cmake
trunk/cmake/UseBackportedModules.cmake
trunk/cmake/UseTR1.cmake
trunk/cmake/WarningDev.cmake
trunk/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindOpenSceneGraph.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindOpenThreads.cmake
trunk/cmake/cmake-2.8.0-modules/osg/Findosg.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgAnimation.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgDB.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgFX.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgGA.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgIntrospection.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgManipulator.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgParticle.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgProducer.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgShadow.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgSim.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgTerrain.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgText.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgUtil.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgViewer.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgVolume.cmake
trunk/cmake/cmake-2.8.0-modules/osg/FindosgWidget.cmake
trunk/cmake/cmake-2.8.0-modules/osg/Findosg_functions.cmake
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
trunk/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
trunk/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
trunk/cmake/cmake-2.8.3-modules/autoinclude.cmake
trunk/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
trunk/cmake/cmake-2.8.4-modules/autoinclude.cmake
trunk/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
trunk/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
trunk/cmake/cmake-2.9.0-modules/autoinclude.cmake
trunk/cmake/export-to-directory.sh
trunk/cmake/ghost-fake-stl/iostream.h
trunk/cmake/ghost-fake-stl/list.h
trunk/cmake/ghost-fake-stl/set.h
trunk/cmake/ghost-fake-stl/vector.h
trunk/cmake/launcher-templates/genericlauncher.cmd.in
trunk/cmake/launcher-templates/genericlauncher.sh.in
trunk/cmake/launcher-templates/launcher.env.cmd.in
trunk/cmake/launcher-templates/launcher.env.sh.in
trunk/cmake/launcher-templates/perconfig.vcproj.user.in
trunk/cmake/launcher-templates/targetlauncher.cmd.in
trunk/cmake/launcher-templates/targetlauncher.sh.in
trunk/cmake/launcher-templates/vcproj.user.in
trunk/cmake/module-docs/AllModuleDependencies.dot
trunk/cmake/module-docs/Example-FindMyPackage-UsingImportedTargets.cmake
trunk/cmake/module-docs/Example-FindMyPackage.cmake
trunk/cmake/module-docs/Example-FindMySimplePackage.cmake
trunk/cmake/module-help.html
trunk/cmake/module-help.txt
trunk/cmake/nested_targets/DCubed/CMakeLists.txt
trunk/cmake/nested_targets/DCubed/d3ew_p/CMakeLists.txt
trunk/cmake/nested_targets/DCubed/d3ew_scene/CMakeLists.txt
trunk/cmake/nested_targets/OpenHaptics/CMakeLists.txt
trunk/cmake/nested_targets/Parasolid/CMakeLists.txt
trunk/cmake/nested_targets/cutil/CMakeLists.txt
trunk/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/classes.nib
trunk/cmake/package/macosx/Resources/en.lproj/MainMenu.nib/info.nib
trunk/cmake/package/macosx/Resources/vrjuggler.plist
trunk/cmake/package/macosx/VRJuggler22BundleInfo.plist.in
trunk/cmake/package/macosx/VRJuggler30BundleInfo.plist.in
trunk/cmake/package/macosx/fixupbundle.cmake.in
trunk/cmake/package-licensing/Boost.cmake
trunk/cmake/package-licensing/Eigen.cmake
trunk/cmake/package-licensing/FLTK.cmake
trunk/cmake/package-licensing/Lua.cmake
trunk/cmake/package-licensing/LuaBind.cmake
trunk/cmake/package-licensing/OpenHapticsAcademicEdition.cmake
trunk/cmake/package-licensing/OpenSceneGraph.cmake
trunk/cmake/package-licensing/PhysicalModelingUtils.cmake
trunk/cmake/package-licensing/Qt-LGPL.cmake
trunk/cmake/package-licensing/VPS.cmake
trunk/cmake/package-licensing/VRJuggLua.cmake
trunk/cmake/package-licensing/VRJuggler.cmake
trunk/cmake/package-licensing/VirtuoseAPI.cmake
trunk/cmake/package-licensing/osgLua.cmake
trunk/cmake/update-help.sh
trunk/cmake/workarounds/mac-alut-framework/AL/alut.h
trunk/cmake/workarounds/mac-gl/GL/gl.h
trunk/cmake/workarounds/mac-gl/GL/glui.h
trunk/cmake/workarounds/mac-gl/GL/glut.h
trunk/cmake/workarounds/mac-openal/AL/al.h
trunk/cmake/workarounds/mac-openal/AL/alc.h
trunk/cmake/workarounds/tchar/tchar.h
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/CMakeLists.txt 2012-07-27 22:21:26 UTC (rev 694)
@@ -3,7 +3,7 @@
# http://academic.cleardefinition.com/
# Iowa State University HCI Graduate Program/VRAC
-cmake_minimum_required(VERSION 2.6.2)
+cmake_minimum_required(VERSION 2.8.8)
# Set package properties
project(cppdom)
@@ -64,7 +64,6 @@
# Perform build configuration of dependencies
###
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-include(UseBackportedModules)
include(CTest)
find_package(Boost)
Deleted: trunk/cmake/BoostTestTargets.cmake
===================================================================
--- trunk/cmake/BoostTestTargets.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BoostTestTargets.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,274 +0,0 @@
-# - Add tests using boost::test
-#
-# Add this line to your test files in place of including a basic boost test header:
-# #include <BoostTestTargetConfig.h>
-#
-# If you cannot do that and must use the included form for a given test,
-# include the line
-# // OVERRIDE_BOOST_TEST_INCLUDED_WARNING
-# in the same file with the boost test include.
-#
-# include(BoostTestTargets)
-# add_boost_test(<testdriver_name> SOURCES <source1> [<more sources...>]
-# [FAIL_REGULAR_EXPRESSION <additional fail regex>]
-# [LAUNCHER <generic launcher script>]
-# [LIBRARIES <library> [<library>...]]
-# [RESOURCES <resource> [<resource>...]]
-# [TESTS <testcasename> [<testcasename>...]])
-#
-# If for some reason you need access to the executable target created,
-# it can be found in ${${testdriver_name}_TARGET_NAME} as specified when
-# you called add_boost_test
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Requires:
-# GetForceIncludeDefinitions
-# CopyResourcesToBuildTree
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__add_boost_test)
- return()
-endif()
-set(__add_boost_test YES)
-
-set(BOOST_TEST_TARGET_PREFIX "boosttest")
-
-if(NOT Boost_FOUND)
- find_package(Boost 1.34.0 QUIET)
-endif()
-if("${Boost_VERSION}0" LESS "1034000")
- set(_shared_msg
- "NOTE: boost::test-based targets and tests cannot "
- "be added: boost >= 1.34.0 required but not found. "
- "(found: '${Boost_VERSION}'; want >=103400) ")
- if(BUILD_TESTING)
- message(FATAL_ERROR
- ${_shared_msg}
- "You may disable BUILD_TESTING to continue without the "
- "tests.")
- else()
- message(STATUS
- ${_shared_msg}
- "BUILD_TESTING disabled, so continuing anyway.")
- endif()
-endif()
-
-include(GetForceIncludeDefinitions)
-include(CopyResourcesToBuildTree)
-
-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
- set(_boosttesttargets_libs)
- set(_boostConfig "BoostTestTargetsIncluded.h")
- if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
- find_package(Boost 1.34.0 QUIET COMPONENTS unit_test_framework)
- endif()
- if(Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
- set(_boosttesttargets_libs "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
- if(Boost_USE_STATIC_LIBS)
- set(_boostConfig "BoostTestTargetsStatic.h")
- else()
- if(NOT APPLE)
- set(_boostConfig "BoostTestTargetsDynamic.h")
- endif()
- endif()
- endif()
- get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
- configure_file("${_moddir}/${_boostConfig}"
- "${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
- COPYONLY)
- include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-endif()
-
-function(add_boost_test _name)
- if(NOT BUILD_TESTING)
- return()
- endif()
- if("${CMAKE_VERSION}" VERSION_LESS "2.8.0")
- if(NOT "${_boost_test_cmakever_pestered}x" EQUALS "${CMAKE_VERSION}x")
- message(STATUS
- "Not adding boost::test targets - CMake 2.8.0 or newer required, using ${CMAKE_VERSION}")
- set(_boost_test_cmakever_pestered
- "${CMAKE_VERSION}"
- CACHE
- INTERNAL
- ""
- FORCE)
- endif()
- return()
- endif()
-
- # parse arguments
- set(_nowhere)
- set(_curdest _nowhere)
- set(_val_args
- SOURCES
- FAIL_REGULAR_EXPRESSION
- LAUNCHER
- LIBRARIES
- RESOURCES
- TESTS)
- set(_bool_args
- USE_COMPILED_LIBRARY)
- foreach(_arg ${_val_args} ${_bool_args})
- set(${_arg})
- endforeach()
- foreach(_element ${ARGN})
- list(FIND _val_args "${_element}" _val_arg_find)
- list(FIND _bool_args "${_element}" _bool_arg_find)
- if("${_val_arg_find}" GREATER "-1")
- set(_curdest "${_element}")
- elseif("${_bool_arg_find}" GREATER "-1")
- set("${_element}" ON)
- set(_curdest _nowhere)
- else()
- list(APPEND ${_curdest} "${_element}")
- endif()
- endforeach()
-
- if(_nowhere)
- message(FATAL_ERROR "Syntax error in use of add_boost_test!")
- endif()
-
- if(NOT SOURCES)
- message(FATAL_ERROR
- "Syntax error in use of add_boost_test: at least one source file required!")
- endif()
-
- if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
-
- include_directories(${Boost_INCLUDE_DIRS})
-
- set(includeType)
- foreach(src ${SOURCES})
- file(READ ${src} thefile)
- if("${thefile}" MATCHES ".*BoostTestTargetConfig.h.*")
- set(includeType CONFIGURED)
- set(includeFileLoc ${src})
- break()
- elseif("${thefile}" MATCHES ".*boost/test/included/unit_test.hpp.*")
- set(includeType INCLUDED)
- set(includeFileLoc ${src})
- set(_boosttesttargets_libs) # clear this out - linking would be a bad idea
- if(NOT
- "${thefile}"
- MATCHES
- ".*OVERRIDE_BOOST_TEST_INCLUDED_WARNING.*")
- message("Please replace the include line in ${src} with this alternate include line instead:")
- message(" \#include <BoostTestTargetConfig.h>")
- message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
- endif()
- break()
- endif()
- endforeach()
-
- if(NOT _boostTestTargetsNagged${_name} STREQUAL "${includeType}")
- if("includeType" STREQUAL "CONFIGURED")
- message(STATUS
- "Test '${_name}' uses the CMake-configurable form of the boost test framework - congrats! (Including File: ${includeFileLoc})")
- elseif("${includeType}" STREQUAL "INCLUDED")
- message("In test '${_name}': ${includeFileLoc} uses the 'included' form of the boost unit test framework.")
- else()
- message("In test '${_name}': Didn't detect the CMake-configurable boost test include.")
- message("Please replace your existing boost test include in that test with the following:")
- message(" \#include <BoostTestTargetConfig.h>")
- message("Once you've saved your changes, re-run CMake. (See BoostTestTargets.cmake for more info)")
- endif()
- endif()
- set(_boostTestTargetsNagged${_name}
- "${includeType}"
- CACHE
- INTERNAL
- ""
- FORCE)
-
-
- if(RESOURCES)
- list(APPEND SOURCES ${RESOURCES})
- endif()
-
- # Generate a unique target name, using the relative binary dir
- # and provided name. (transform all / into _ and remove all other
- # non-alphabet characters)
- file(RELATIVE_PATH
- targetpath
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}")
- string(REGEX REPLACE "[^A-Za-z/_]" "" targetpath "${targetpath}")
- string(REPLACE "/" "_" targetpath "${targetpath}")
-
- set(_target_name ${BOOST_TEST_TARGET_PREFIX}-${targetpath}-${_name})
- set(${_name}_TARGET_NAME "${_target_name}" PARENT_SCOPE)
-
- # Build the test.
- add_executable(${_target_name} ${SOURCES})
-
- list(APPEND LIBRARIES ${_boosttesttargets_libs})
-
- if(LIBRARIES)
- target_link_libraries(${_target_name} ${LIBRARIES})
- endif()
-
- if(RESOURCES)
- set_property(TARGET ${_target_name} PROPERTY RESOURCE ${RESOURCES})
- copy_resources_to_build_tree(${_target_name})
- endif()
-
- if(NOT Boost_TEST_FLAGS)
-# set(Boost_TEST_FLAGS --catch_system_error=yes --output_format=XML)
- set(Boost_TEST_FLAGS --catch_system_error=yes)
- endif()
-
- # TODO: Figure out why only recent boost handles individual test running properly
-
- if(LAUNCHER)
- set(_test_command ${LAUNCHER} "\$<TARGET_FILE:${_target_name}>")
- else()
- set(_test_command ${_target_name})
- endif()
-
- if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
- foreach(_test ${TESTS})
- add_test(NAME
- ${_name}-${_test}
- COMMAND
- ${_test_command}
- --run_test=${_test}
- ${Boost_TEST_FLAGS})
- if(FAIL_REGULAR_EXPRESSION)
- set_tests_properties(${_name}-${_test}
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${FAIL_REGULAR_EXPRESSION}")
- endif()
- endforeach()
- else()
- add_test(NAME
- ${_name}-boost_test
- COMMAND
- ${_test_command}
- ${Boost_TEST_FLAGS})
- if(FAIL_REGULAR_EXPRESSION)
- set_tests_properties(${_name}-${_test}
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${FAIL_REGULAR_EXPRESSION}")
- endif()
- endif()
-
- # CppCheck the test if we can.
- if(COMMAND add_cppcheck)
- add_cppcheck(${_target_name} STYLE UNUSED_FUNCTIONS)
- endif()
-
- endif()
-endfunction()
Deleted: trunk/cmake/BoostTestTargetsDynamic.h
===================================================================
--- trunk/cmake/BoostTestTargetsDynamic.h 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BoostTestTargetsDynamic.h 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,9 +0,0 @@
-// Small header computed by CMake to set up boost test.
-// include AFTER #define BOOST_TEST_MODULE whatever
-// but before any other boost test includes.
-
-// Using the Boost UTF dynamic library
-
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-
Deleted: trunk/cmake/BoostTestTargetsIncluded.h
===================================================================
--- trunk/cmake/BoostTestTargetsIncluded.h 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BoostTestTargetsIncluded.h 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,7 +0,0 @@
-// Small header computed by CMake to set up boost test.
-// include AFTER #define BOOST_TEST_MODULE whatever
-// but before any other boost test includes.
-
-// Using the Boost UTF included framework
-
-#include <boost/test/included/unit_test.hpp>
Deleted: trunk/cmake/BoostTestTargetsStatic.h
===================================================================
--- trunk/cmake/BoostTestTargetsStatic.h 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BoostTestTargetsStatic.h 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,7 +0,0 @@
-// Small header computed by CMake to set up boost test.
-// include AFTER #define BOOST_TEST_MODULE whatever
-// but before any other boost test includes.
-
-// Using the Boost UTF static library
-
-#include <boost/test/unit_test.hpp>
Deleted: trunk/cmake/BundleOSGPlugins.cmake
===================================================================
--- trunk/cmake/BundleOSGPlugins.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BundleOSGPlugins.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,83 +0,0 @@
-# - Provide access to the OpenSceneGraph runtime files for bundling in
-# an installation or package.
-#
-# Sets these variables:
-# - OSGDB_PLUGINS_RELEASE
-# - OSGDB_PLUGINS_DEBUG
-# - OSGWRAPPER_PLUGINS_RELEASE
-# - OSGWRAPPER_PLUGINS_DEBUG
-# - OSG_RUNTIME_LIBRARY_DIR
-# - OSG_PATH_TO_PLUGINS
-#
-# Creates this function:
-# - install_osg_plugins( {varNameForOutputFilenames} )
-#
-# Requires these CMake modules:
-# no additional modules required
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-
-function(_osgbundle_split_debug_versions releasevar debugvar)
- set(release)
- set(debug)
- foreach(fn ${ARGN})
- get_filename_component(name "${fn}" NAME_WE)
- if(${name} MATCHES "d$")
- list(APPEND debug "${fn}")
- else()
- list(APPEND release "${fn}")
- endif()
- endforeach()
- set(${releasevar} ${release} PARENT_SCOPE)
- set(${debugvar} ${debug} PARENT_SCOPE)
-endfunction()
-
-function(_osgbundle_find_plugins varprefix filenameprefix)
- file(GLOB
- all
- "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
- _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
- ${varprefix}_PLUGINS_DEBUG
- ${all})
- set(${varprefix}_PLUGINS_RELEASE
- "${${varprefix}_PLUGINS_RELEASE}"
- PARENT_SCOPE)
- set(${varprefix}_PLUGINS_DEBUG
- "${${varprefix}_PLUGINS_DEBUG}"
- PARENT_SCOPE)
-endfunction()
-
-if(OPENSCENEGRAPH_FOUND)
- if(WIN32)
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- get_filename_component(_osgroot "${_osglibdir}/.." ABSOLUTE)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osgroot}/bin")
- set(OSG_PATH_TO_PLUGINS "bin/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
- else()
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
- set(OSG_PATH_TO_PLUGINS "lib/osgPlugins-${OPENSCENEGRAPH_VERSION}/")
- endif()
- # Find the osgDB plugins
- _osgbundle_find_plugins(OSGDB osgdb)
- _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
-endif()
-
-function(install_osg_plugins var)
- set(INSTALLEDPLUGINS)
- foreach(plugin ${OSGDB_PLUGINS_RELEASE} ${OSGWRAPPER_PLUGINS_RELEASE})
- install(FILES "${plugin}" DESTINATION "${OSG_PATH_TO_PLUGINS}")
- get_filename_component(name "${plugin}" NAME)
- list(APPEND INSTALLEDPLUGINS "${OSG_PATH_TO_PLUGINS}/${name}")
- endforeach()
- set(${var} ${INSTALLEDPLUGINS} PARENT_SCOPE)
-endfunction()
Deleted: trunk/cmake/BundleOSGRuntime.cmake
===================================================================
--- trunk/cmake/BundleOSGRuntime.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BundleOSGRuntime.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,118 +0,0 @@
-# - Include the OpenSceneGraph runtime files in an installation or built package.
-#
-# OSGRUNTIME_BUNDLE - Set to "yes" to enable this behavior
-# OSGRUNTIME_zlib1dll - Must be set to the location of zlib1.dll on Windows
-# OSGRUNTIME_zlib1ddll - Can be set to the location of zlib1d.dll (debug) on Windows.
-# If set, will be installed.
-#
-# Requires these CMake modules:
-# no additional modules required
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-function(_osgbundle_split_debug_versions releasevar debugvar)
- set(release)
- set(debug)
- foreach(fn ${ARGN})
- get_filename_component(name "${fn}" NAME_WE)
- if(${name} MATCHES "d$")
- list(APPEND debug "${fn}")
- else()
- list(APPEND release "${fn}")
- endif()
- endforeach()
- set(${releasevar} ${release} PARENT_SCOPE)
- set(${debugvar} ${debug} PARENT_SCOPE)
-endfunction()
-
-function(_osgbundle_find_plugins varprefix filenameprefix)
- file(GLOB
- all
- "${OSG_RUNTIME_LIBRARY_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}/${filenameprefix}*${CMAKE_SHARED_LIBRARY_SUFFIX}")
- _osgbundle_split_debug_versions(${varprefix}_PLUGINS_RELEASE
- ${varprefix}_PLUGINS_DEBUG
- ${all})
-endfunction()
-
-if(OPENSCENEGRAPH_FOUND)
- if(WIN32)
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- get_filename_component(_osgroot "${_osglibdir}/.." ABSOLUTE)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osgroot}/bin")
- find_file(OSGBUNDLE_zlib1dll
- zlib1.dll
- PATHS
- "${_osgroot}/bin"
- "${_osgroot}/lib")
- find_file(OSGBUNDLE_zlib1ddll
- zlib1d.dll
- PATHS
- "${_osgroot}/bin"
- "${_osgroot}/lib")
- mark_as_advanced(OSGBUNDLE_zlib1dll OSGBUNDLE_zlib1ddll)
- set(_osgbundle_required OSGBUNDLE_zlib1dll)
- set(_osgbundle_platformOK on)
- else()
- get_filename_component(_osglibdir "${OSG_LIBRARY}" PATH)
- set(OSG_RUNTIME_LIBRARY_DIR "${_osglibdir}")
- set(_osgbundle_platformOK on)
- endif()
-
- # Find the osgDB plugins
-
- _osgbundle_find_plugins(OSGDB osgdb)
- _osgbundle_find_plugins(OSGWRAPPER osgwrapper)
-endif()
-
-
-
-if(_osgbundle_platformOK)
- set(_osgbundle_caninstall on)
- foreach(_var ${_osgbundle_required})
- if(NOT ${_var})
- # If we are missing a single required file, cut out now.
- set(_osgbundle_caninstall off)
- option(OSGRUNTIME_BUNDLE
- "Install a local copy of the OpenSceneGraph runtime files with the project."
- off)
- endif()
- endforeach()
- if(_osgbundle_caninstall)
- option(OSGRUNTIME_BUNDLE
- "Install a local copy of the OpenSceneGraph runtime files with the project."
- on)
- endif()
-endif()
-
-mark_as_advanced(OSGRUNTIME_BUNDLE)
-
-if(OSGRUNTIME_BUNDLE AND OPENSCENEGRAPH_FOUND AND _osgbundle_caninstall)
- if(WIN32)
- set(DESTINATION bin)
- install(FILES "${OSGBUNDLE_zlib1dll}"
- DESTINATION ${DESTINATION})
-
- if(OSGBUNDLE_zlib1ddll)
- install(FILES "${OSGBUNDLE_zlib1ddll}"
- DESTINATION ${DESTINATION})
- endif()
-
- else()
- set(DESTINATION lib)
- endif()
-
- install(DIRECTORY "${_osgroot}/bin/" "${_osgroot}/lib/"
- DESTINATION ${DESTINATION}
- FILES_MATCHING
-
- # Runtime files
- PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
-endif()
Deleted: trunk/cmake/BundleVRJ22Runtime.cmake
===================================================================
--- trunk/cmake/BundleVRJ22Runtime.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BundleVRJ22Runtime.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,99 +0,0 @@
-# - Include the VR Juggler runtime files in an installation or built package.
-#
-# VRJUGGLERRUNTIME_BUNDLE
-# VRJUGGLERRUNTIME_BUNDLE_DEBUG - set to yes to include debug dll's as well
-#
-# Requires these CMake modules:
-# FindVRJuggler22 and its dependencies
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(WIN32)
- option(VRJUGGLERRUNTIME_BUNDLE
- "Install a local copy of the VR Juggler runtime files with the project."
- on)
- option(VRJUGGLERRUNTIME_BUNDLE_DEBUG
- "Install the VR Juggler debug runtime files as well."
- off)
- mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-else()
- # TODO - how to handle when not on Windows?
- #option(VRJUGGLERRUNTIME_BUNDLE "Install a local copy of the VR Juggler runtime files with the project." off)
-endif()
-
-mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-
-if(VRJUGGLERRUNTIME_BUNDLE AND VRJUGGLER22_FOUND)
- if(WIN32)
- get_filename_component(_vrjlibdir "${VRJ22_LIBRARY_RELEASE}" PATH)
- get_filename_component(_vrjroot "${_vrjlibdir}/../" ABSOLUTE)
-
- # TODO - make sure gadgeteer and sonix can find their DSO's at runtime...
-
- foreach(_dir bin lib)
- if(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
- install(DIRECTORY "${_vrjroot}/${_dir}/"
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
- )
- else()
- install(DIRECTORY ${_vrjroot}/${_dir}/
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
-
- PATTERN "*d.dll" EXCLUDE # exclude debug dll's
- PATTERN "*-gd-*.dll" EXCLUDE # exclude Boost debug dll's
- )
- endif()
-
- endforeach()
-
- install(DIRECTORY ${_vrjroot}/share/
- DESTINATION share
- FILES_MATCHING
-
- # Runtime files
- PATTERN "*.dll"
- PATTERN "*.jar"
-
- # Data files
- PATTERN "*.wav"
- PATTERN "*.xml"
- PATTERN "*.xsl"
- PATTERN "*.xsd"
- PATTERN "*.flt"
- PATTERN "*.dat"
- PATTERN "*.table"
-
-
- # Config files
- PATTERN "*.jdef"
- PATTERN "*.jconf"
- PATTERN "*.cfg"
- PATTERN "hosts.allow"
-
- # Other Files
- PATTERN "*.txt"
- PATTERN "COPYING*"
- PATTERN "ChangeLog"
- )
-
- endif()
-
-
-
-endif()
Deleted: trunk/cmake/BundleVRJ30Runtime.cmake
===================================================================
--- trunk/cmake/BundleVRJ30Runtime.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/BundleVRJ30Runtime.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,96 +0,0 @@
-# - Include the VR Juggler runtime files in an installation or built package.
-#
-# VRJUGGLERRUNTIME_BUNDLE
-# VRJUGGLERRUNTIME_BUNDLE_DEBUG - set to yes to include debug dll's as well
-#
-# Requires these CMake modules:
-# FindVRJuggler22 and its dependencies
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-# Updated for VR Juggler 3.0 by:
-# Brandon Newendorp <br...@ne...>
-
-if(WIN32)
- option(VRJUGGLERRUNTIME_BUNDLE
- "Install a local copy of the VR Juggler runtime files with the project."
- on)
- option(VRJUGGLERRUNTIME_BUNDLE_DEBUG
- "Install the VR Juggler debug runtime files as well."
- off)
- mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-else()
- # TODO - how to handle when not on Windows?
- #option(VRJUGGLERRUNTIME_BUNDLE "Install a local copy of the VR Juggler runtime files with the project." off)
-endif()
-
-mark_as_advanced(VRJUGGLERRUNTIME_BUNDLE VRJUGGLERRUNTIME_BUNDLE_DEBUG)
-
-if(VRJUGGLERRUNTIME_BUNDLE AND VRJUGGLER22_FOUND)
- if(WIN32)
- get_filename_component(_vrjlibdir "${VRJ22_LIBRARY_RELEASE}" PATH)
- get_filename_component(_vrjroot "${_vrjlibdir}/../" ABSOLUTE)
-
- # TODO - make sure gadgeteer and sonix can find their DSO's at runtime...
-
- foreach(_dir bin lib)
- if(VRJUGGLERRUNTIME_BUNDLE_DEBUG)
- install(DIRECTORY "${_vrjroot}/${_dir}/"
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
- )
- else()
- install(DIRECTORY ${_vrjroot}/${_dir}/
- DESTINATION bin
- PATTERN "*.lib" EXCLUDE # exclude static and link libraries
- PATTERN "*.exe" EXCLUDE # exclude unneeded executables
- PATTERN "*.py" EXCLUDE # exclude unneeded python executables
- PATTERN "*.pyc" EXCLUDE # exclude unneeded python executables
-
- PATTERN "*d.dll" EXCLUDE # exclude debug dll's
- PATTERN "*-gd-*.dll" EXCLUDE # exclude Boost debug dll's
- )
- endif()
-
- endforeach()
-
- install(DIRECTORY ${_vrjroot}/share/
- DESTINATION share
- FILES_MATCHING
-
- # Runtime files
- PATTERN "*.dll"
- PATTERN "*.jar"
-
- # Data files
- PATTERN "*.wav"
- PATTERN "*.xml"
- PATTERN "*.xsl"
- PATTERN "*.xsd"
- PATTERN "*.flt"
- PATTERN "*.dat"
- PATTERN "*.table"
-
-
- # Config files
- PATTERN "*.jdef"
- PATTERN "*.jconf"
- PATTERN "*.cfg"
- PATTERN "hosts.allow"
-
- # Other Files
- PATTERN "*.txt"
- PATTERN "COPYING*"
- PATTERN "ChangeLog"
- )
-
- endif()
-
-
-
-endif()
Deleted: trunk/cmake/CheckMacHIDAPI.cmake
===================================================================
--- trunk/cmake/CheckMacHIDAPI.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CheckMacHIDAPI.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,73 +0,0 @@
-# - Script to check if the signature for a mac HID callback uses UInt32 or uint32_t
-# Requires that the associated CPP file be present: CheckMacHIDAPI.cpp.
-#
-# MACOSX_HID_UINT32T, set according to the results of our test.
-#
-# Use add_definitions(-DMACOSX_HID_UINT32T=${MACOSX_HID_UINT32T}) in your
-# listfile and the following prototype for the function you'd like to
-# register using setInterruptReportHandlerCallback:
-# void ReaderReportCallback(
-# void *target,
-# IOReturn result,
-# void *refcon,
-# void *sender,
-# MACOSX_HID_UINT32T size
-# )
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-
-if(APPLE)
- if(NOT MACOSX_HID_UINT32T)
- get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
- try_compile(_HID_uint32t
- ${CMAKE_BINARY_DIR}
- ${_moddir}/CheckMacHIDAPI.cpp
- OUTPUT_VARIABLE
- _HID_uint32t_OUTPUT
- COMPILE_DEFINITIONS
- -DMACOSX_HID_UINT32T=uint32_t)
- message(STATUS
- "Checking uint32_t in HID callback signature... ${_HID_uint32t}")
-
- try_compile(_HID_UInt32
- ${CMAKE_BINARY_DIR}
- ${_moddir}/CheckMacHIDAPI.cpp
- OUTPUT_VARIABLE
- _HID_UInt32_OUTPUT
- COMPILE_DEFINITIONS
- -DMACOSX_HID_UINT32T=UInt32)
- message(STATUS
- "Checking UInt32 in HID callback signature... ${_HID_UInt32}")
-
-
- if(_HID_uint32t)
- set(MACOSX_HID_UINT32T
- "uint32_t"
- CACHE
- STRING
- "The 32-bit uint type desired in the callback set by setInterruptReportHandlerCallback")
- mark_as_advanced(MACOSX_HID_UINT32T)
- elseif(_HID_UInt32)
- set(MACOSX_HID_UINT32T
- "UInt32"
- CACHE
- STRING
- "The 32-bit uint type desired in the callback set by setInterruptReportHandlerCallback")
- mark_as_advanced(MACOSX_HID_UINT32T)
- else()
- message(SEND_ERROR
- "ERROR: Could not detect appropriate Mac HID uint32 type!")
- endif()
-
- endif()
-endif()
Deleted: trunk/cmake/CheckMacHIDAPI.cpp
===================================================================
--- trunk/cmake/CheckMacHIDAPI.cpp 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CheckMacHIDAPI.cpp 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,47 +0,0 @@
-/**
- * \file CheckMacHIDAPI.cpp
- * \brief C++ source file used by CMake module CheckMacHIDAPI.cmake
- *
- * \author
- * Ryan Pavlik, 2009-2010
- * <rp...@ia...>
- * http://academic.cleardefinition.com/
- *
- * \author
- * Based on code extracted from VRPN 07.22 for use as a minimal test case
- *
- * Attempts to compile a difficult bit of code against the Mac
- * HID API, as two different types have been required in the callback
- * function (UInt32 and uint32_t) and testing is the best way to know
- * which one is correct for a given system.
- *
- */
-
-
-#if defined(__APPLE__)
-
-#include <stdio.h>
-#include <IOKit/IOCFPlugIn.h>
-#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-void ReaderReportCallback(
- void *target, IOReturn result, void *refcon, void *sender, MACOSX_HID_UINT32T size
- )
- {}
-#endif
-
-int main(int argc, char* argv[]) {
-#if defined(__APPLE__)
- io_object_t _ioObject;
- IOHIDDeviceInterface122 **_interface;
- bool _gotdata;
- int _gotsize;
- unsigned char _buffer[512];
- IOReturn result = (*_interface)->setInterruptReportHandlerCallback(_interface,
- _buffer, 512,
- ReaderReportCallback,
- NULL, 0);
-#endif
- return 0;
-}
Deleted: trunk/cmake/CheckVersion.cmake
===================================================================
--- trunk/cmake/CheckVersion.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CheckVersion.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,47 +0,0 @@
-# - Utility function for Find modules considering multiple possible versions
-#
-# Requires these CMake modules:
-# no additional modules required
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__check_version)
- return()
-endif()
-set(__check_version YES)
-
-function(check_version var packagename version)
- # By default, we say that the version is good enough
- set(_result TRUE)
-
- # Was a version requested? If so, what is our test condition?
- if(${packagename}_FIND_VERSION)
- if(${packagename}_FIND_VERSION_EXACT)
- # Yes, an exact == version was requested - check it.
-
- if(NOT "${version}" VERSION_EQUAL "${${packagename}_FIND_VERSION}")
- # version is not an exact match
- set(_result FALSE)
- endif()
- else()
- # Yes, a minimum >= version was requested - check it.
-
- if("${version}" VERSION_LESS "${${packagename}_FIND_VERSION}")
- # version is lower than requested
- set(_result FALSE)
- endif()
-
- endif()
- endif()
-
- # Return _result
- set(${var} ${_result} PARENT_SCOPE)
-endfunction()
Deleted: trunk/cmake/CleanDirectoryList.cmake
===================================================================
--- trunk/cmake/CleanDirectoryList.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CleanDirectoryList.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,48 +0,0 @@
-# - Removes duplicate entries and non-directories from a provided list
-#
-# clean_directory_list(<listvar> [<additional list items>...])
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__clean_directory_list)
- return()
-endif()
-set(__clean_directory_list YES)
-
-function(clean_directory_list _var)
- # combine variable's current value with additional list items
- set(_in ${${_var}} ${ARGN})
-
- if(_in)
- # Initial list cleaning
- list(REMOVE_DUPLICATES _in)
-
- # Grab the absolute path of each actual directory
- set(_out)
- foreach(_dir ${_in})
- if(IS_DIRECTORY "${_dir}")
- get_filename_component(_dir "${_dir}" ABSOLUTE)
- file(TO_CMAKE_PATH "${_dir}" _dir)
- list(APPEND _out "${_dir}")
- endif()
- endforeach()
-
- if(_out)
- # Clean up the output list now
- list(REMOVE_DUPLICATES _out)
- endif()
-
- # return _out
- set(${_var} "${_out}" PARENT_SCOPE)
- endif()
-endfunction()
Deleted: trunk/cmake/CleanLibraryList.cmake
===================================================================
--- trunk/cmake/CleanLibraryList.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CleanLibraryList.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,72 +0,0 @@
-# - A smarter replacement for list(REMOVE_DUPLICATES) for library lists
-#
-# Note that, in the case of cyclic link dependencies, you _do_ actually need
-# a library in a list multiple times. So, only use this function when you know
-# that the dependency graph is acyclic.
-#
-# clean_library_list(<listvar> [<additional list items>...]) - where
-# listvar is the name of a destination variable, and also possibly a source, and
-# it is followed by any number (including 0) of additional libraries to append
-# to the list before processing.
-#
-# Removes duplicates from the list, leaving only the last instance, while
-# preserving the meaning of the "optimized", "debug", and "general" labeling.
-# (Libraries listed as general are listed in the result instead as optimized and
-# debug)
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__clean_library_list)
- return()
-endif()
-set(__clean_library_list YES)
-
-function(clean_library_list _var)
- # combine variable's current value with additional list items
- set(_work ${${_var}} ${ARGN})
- if(_work)
- # Turn each of optimized, debug, and general into flags
- # prefixed on their respective library (combining list items)
- string(REGEX REPLACE "optimized;" "1CLL%O%" _work "${_work}")
- string(REGEX REPLACE "debug;" "1CLL%D%" _work "${_work}")
- string(REGEX REPLACE "general;" "1CLL%G%" _work "${_work}")
-
- # Any library that doesn't have a prefix is general, and a general
- # library is both debug and optimized so stdize it
- set(_std)
- foreach(_lib ${_work})
- if(NOT "${_lib}" MATCHES "^1CLL%.%")
- list(APPEND _std "1CLL%D%${_lib}" "1CLL%O%${_lib}")
- elseif("${_lib}" MATCHES "^1CLL%G%")
- string(REPLACE "1CLL%G%" "" _justlib "${_lib}")
- list(APPEND _std "1CLL%D%${_justlib}" "1CLL%O%${_justlib}")
- else()
- list(APPEND _std "${_lib}")
- endif()
- endforeach()
-
- # REMOVE_DUPLICATES leaves the first - so we reverse before and after
- # to keep the last, instead
- list(REVERSE _std)
- list(REMOVE_DUPLICATES _std)
- list(REVERSE _std)
-
- # Split list items back out again: turn prefixes into the
- # library type flags.
- string(REGEX REPLACE "1CLL%D%" "debug;" _std "${_std}")
- string(REGEX REPLACE "1CLL%O%" "optimized;" _std "${_std}")
-
- # Return _std
- set(${_var} ${_std} PARENT_SCOPE)
- endif()
-endfunction()
Deleted: trunk/cmake/CppcheckTargets.cmake
===================================================================
--- trunk/cmake/CppcheckTargets.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CppcheckTargets.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,213 +0,0 @@
-# - Run cppcheck on c++ source files as a custom target and a test
-#
-# include(CppcheckTargets)
-# add_cppcheck(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FAIL_ON_WARNINGS]) -
-# Create a target to check a target's sources with cppcheck and the indicated options
-# add_cppcheck_sources(<target-name> [UNUSED_FUNCTIONS] [STYLE] [POSSIBLE_ERROR] [FAIL_ON_WARNINGS]) -
-# Create a target to check standalone sources with cppcheck and the indicated options
-#
-# Requires these CMake modules:
-# Findcppcheck
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__add_cppcheck)
- return()
-endif()
-set(__add_cppcheck YES)
-
-if(NOT CPPCHECK_FOUND)
- find_package(cppcheck QUIET)
-endif()
-
-if(CPPCHECK_FOUND)
- if(NOT TARGET all_cppcheck)
- add_custom_target(all_cppcheck)
- set_target_properties(all_cppcheck PROPERTIES EXCLUDE_FROM_ALL TRUE)
- endif()
-endif()
-
-function(add_cppcheck_sources _targetname)
- if(CPPCHECK_FOUND)
- set(_cppcheck_args)
- set(_input ${ARGN})
- list(FIND _input UNUSED_FUNCTIONS _unused_func)
- if("${_unused_func}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG})
- list(REMOVE_AT _input ${_unused_func})
- endif()
-
- list(FIND _input STYLE _style)
- if("${_style}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG})
- list(REMOVE_AT _input ${_style})
- endif()
-
- list(FIND _input POSSIBLE_ERROR _poss_err)
- if("${_poss_err}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG})
- list(REMOVE_AT _input ${_poss_err})
- endif()
-
- list(FIND _input FAIL_ON_WARNINGS _fail_on_warn)
- if("${_fail_on_warn}" GREATER "-1")
- list(APPEND
- CPPCHECK_FAIL_REGULAR_EXPRESSION
- ${CPPCHECK_WARN_REGULAR_EXPRESSION})
- list(REMOVE_AT _input ${_fail_on_warn})
- endif()
-
- set(_files)
- foreach(_source ${_input})
- get_source_file_property(_cppcheck_loc "${_source}" LOCATION)
- if(_cppcheck_loc)
- # This file has a source file property, carry on.
- get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE)
- if("${_cppcheck_lang}" MATCHES "CXX")
- list(APPEND _files "${_cppcheck_loc}")
- endif()
- else()
- # This file doesn't have source file properties - figure it out.
- get_filename_component(_cppcheck_loc "${_source}" ABSOLUTE)
- if(EXISTS "${_cppcheck_loc}")
- list(APPEND _files "${_cppcheck_loc}")
- else()
- message(FATAL_ERROR
- "Adding CPPCHECK for file target ${_targetname}: "
- "File ${_source} does not exist or needs a corrected path location "
- "since we think its absolute path is ${_cppcheck_loc}")
- endif()
- endif()
- endforeach()
-
- if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
- # Older than CMake 2.8.0
- add_test(${_targetname}_cppcheck_test
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- else()
- # CMake 2.8.0 and newer
- add_test(NAME
- ${_targetname}_cppcheck_test
- COMMAND
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- endif()
-
- set_tests_properties(${_targetname}_cppcheck_test
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${CPPCHECK_FAIL_REGULAR_EXPRESSION}")
-
- add_custom_command(TARGET
- all_cppcheck
- PRE_BUILD
- COMMAND
- ${CPPCHECK_EXECUTABLE}
- ${CPPCHECK_QUIET_ARG}
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files}
- WORKING_DIRECTORY
- "${CMAKE_CURRENT_SOURCE_DIR}"
- COMMENT
- "${_targetname}_cppcheck: Running cppcheck on target ${_targetname}..."
- VERBATIM)
- endif()
-endfunction()
-
-function(add_cppcheck _name)
- if(NOT TARGET ${_name})
- message(FATAL_ERROR
- "add_cppcheck given a target name that does not exist: '${_name}' !")
- endif()
- if(CPPCHECK_FOUND)
- set(_cppcheck_args)
-
- list(FIND ARGN UNUSED_FUNCTIONS _unused_func)
- if("${_unused_func}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_UNUSEDFUNC_ARG})
- endif()
-
- list(FIND ARGN STYLE _style)
- if("${_style}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_STYLE_ARG})
- endif()
-
- list(FIND ARGN POSSIBLE_ERROR _poss_err)
- if("${_poss_err}" GREATER "-1")
- list(APPEND _cppcheck_args ${CPPCHECK_POSSIBLEERROR_ARG})
- endif()
-
- list(FIND _input FAIL_ON_WARNINGS _fail_on_warn)
- if("${_fail_on_warn}" GREATER "-1")
- list(APPEND
- CPPCHECK_FAIL_REGULAR_EXPRESSION
- ${CPPCHECK_WARN_REGULAR_EXPRESSION})
- list(REMOVE_AT _input ${_unused_func})
- endif()
-
- get_target_property(_cppcheck_sources "${_name}" SOURCES)
- set(_files)
- foreach(_source ${_cppcheck_sources})
- get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE)
- get_source_file_property(_cppcheck_loc "${_source}" LOCATION)
- if("${_cppcheck_lang}" MATCHES "CXX")
- list(APPEND _files "${_cppcheck_loc}")
- endif()
- endforeach()
-
- if("1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
- # Older than CMake 2.8.0
- add_test(${_name}_cppcheck_test
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- else()
- # CMake 2.8.0 and newer
- add_test(NAME
- ${_name}_cppcheck_test
- COMMAND
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files})
- endif()
-
- set_tests_properties(${_name}_cppcheck_test
- PROPERTIES
- FAIL_REGULAR_EXPRESSION
- "${CPPCHECK_FAIL_REGULAR_EXPRESSION}")
-
- add_custom_command(TARGET
- all_cppcheck
- PRE_BUILD
- COMMAND
- ${CPPCHECK_EXECUTABLE}
- ${CPPCHECK_QUIET_ARG}
- ${CPPCHECK_TEMPLATE_ARG}
- ${_cppcheck_args}
- ${_files}
- WORKING_DIRECTORY
- "${CMAKE_CURRENT_SOURCE_DIR}"
- COMMENT
- "${_name}_cppcheck: Running cppcheck on target ${_name}..."
- VERBATIM)
- endif()
-
-endfunction()
Deleted: trunk/cmake/CreateDashboardScripts.cmake
===================================================================
--- trunk/cmake/CreateDashboardScripts.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CreateDashboardScripts.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,196 +0,0 @@
-# - Create ctest -S scripts to use to run dashboard builds
-#
-# include(CreateDashboardScripts)
-# create_dashboard_scripts([<initialcachetemplatefilename>])
-#
-# If you need additional settings to persist from the "parent" CMake instance
-# to the initial cache created by the dashboard script,
-# you may pass a filename which will be configured into the initial cache.
-#
-# In the resulting DASHBOARDSCRIPT_BASE_DIRECTORY, an end-user
-# may optionally create a file named
-# CustomInitialCache.${DASHBOARDSCRIPT_SCRIPT_NAME}
-# (by default, CustomInitialCache.go.cmake) containing set commands that use
-# the CACHE option, to set up additional site-local cache variable values.
-#
-# Requires these CMake modules:
-# GetCompilerInfoString
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-# Only do any of the prep work if not already in a dashboard script
-if(NOT IN_DASHBOARD_SCRIPT)
-
- # Hide a CTest variable
- mark_as_advanced(DART_TESTING_TIMEOUT)
-
- include(GetCompilerInfoString)
-
- get_compiler_info_string(_COMPILERID)
-
- # We must run the following at "include" time, not at function call time,
- # to find the path to this module rather than the path to a calling list file
- get_filename_component(_dashboardmoddir
- ${CMAKE_CURRENT_LIST_FILE}
- PATH)
-
- if(NOT "$ENV{USER}" MATCHES "^$")
- set(_user "$ENV{USER}")
- elseif(NOT "$ENV{USERNAME}" MATCHES "^$")
- set(_user "$ENV{USERNAME}")
- endif()
-
- if(NOT _dashboardscript_machine)
- if(NOT SITE)
- site_name(SITE)
- endif()
- set(_dashboardscript_machine "${SITE}" CACHE INTERNAL "")
- set(SITE
- "${_user}@${_dashboardscript_machine}"
- CACHE
- STRING
- "Human-readable site name"
- FORCE)
- endif()
-
- set(DASHBOARDSCRIPT_BASE_DIRECTORY
- "${CMAKE_BINARY_DIR}/Dashboards-${_dashboardscript_machine}-${_user}"
- CACHE
- PATH
- "Directory to use as the root of all dashboard work")
- mark_as_advanced(DASHBOARDSCRIPT_BASE_DIRECTORY)
-
- set(DASHBOARDSCRIPT_SOURCE_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
- set(BUILDNAME
- "${CMAKE_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}-${_COMPILERID}"
- CACHE
- STRING
- "Human-readable build ID info")
-
- set(DASHBOARDSCRIPT_CMAKE_COMMAND
- "${CMAKE_COMMAND}"
- CACHE
- FILEPATH
- "The cmake binary to use when configuring a dashboard build")
- mark_as_advanced(DASHBOARDSCRIPT_CMAKE_COMMAND)
-
- # Try to find CTest, preferably right next to the chosen CMake
- if(DASHBOARDSCRIPT_CMAKE_COMMAND)
- get_filename_component(_cmake_dir
- ${DASHBOARDSCRIPT_CMAKE_COMMAND}
- PATH)
- else()
- get_filename_component(_cmake_dir ${CMAKE_COMMAND} PATH)
- endif()
- find_program(DASHBOARDSCRIPT_CTEST_EXECUTABLE
- NAMES
- ctest
- HINTS
- "${_cmake_dir}"
- NO_DEFAULT_PATH)
- find_program(DASHBOARDSCRIPT_CTEST_EXECUTABLE
- NAMES
- ctest
- HINTS
- "${_cmake_dir}")
-
-
- set(DASHBOARDSCRIPT_CTEST_EXECUTABLE
- "${DASHBOARDSCRIPT_CTEST_EXECUTABLE}"
- CACHE
- FILEPATH
- "Path to the CTest executable to use for dashboard builds.")
- mark_as_advanced(DASHBOARDSCRIPT_CTEST_EXECUTABLE)
-
-
- # Optionals
-
- if(NOT "1.${CMAKE_VERSION}" VERSION_LESS "1.2.8.0")
- if(IS_DIRECTORY "${CMAKE_SOURCE_DIRECTORY}/.git")
- find_program(DASHBOARDSCRIPT_GIT_EXECUTABLE NAMES git git.cmd)
- if(DASHBOARDSCRIPT_GIT_EXECUTABLE)
-
- set(UPDATE_TYPE "git")
- set(UPDATE_COMMAND "${DASHBOARDSCRIPT_GIT_EXECUTABLE}")
- set(UPDATE_OPTIONS "")
- mark_as_advanced(DASHBOARDSCRIPT_GIT_EXECUTABLE)
- endif()
- endif()
- endif()
-
-else()
- # IN_DASHBOARD_SCRIPT is YES
- message(STATUS
- "CreateDashboardScripts detected that we're in a dashboard script already.")
-endif()
-
-function(create_dashboard_scripts)
- # Only create the script if we have all the required variables
- # and are not already in it, and are at least 2.8.0.
- if(DASHBOARDSCRIPT_BASE_DIRECTORY AND
- DASHBOARDSCRIPT_SOURCE_DIRECTORY AND
- DASHBOARDSCRIPT_BASE_DIRECTORY AND
- BUILDNAME AND
- DASHBOARDSCRIPT_CMAKE_COMMAND AND
- DASHBOARDSCRIPT_CTEST_EXECUTABLE AND
- NOT IN_DASHBOARD_SCRIPT AND
- NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.0")
-
- set(_Continuous_cron "15 * * * * ")
- set(_Nightly_cron "15 0 * * * ")
- set(_Experimental_cron
- "\nor run this command for an one-off experimental test build:\n")
- set(_Experimental_flags "-VV")
-
- message(STATUS
- "Dashboard scripts have been generated for automatic nightly and continuous builds.")
- if(WIN32)
- set(_Continuous_cron)
- set(_Nightly_cron)
- message(STATUS
- "You can set up scheduled tasks to run these command lines:")
- else()
- message(STATUS "You can add these sample lines to your crontab:")
- endif()
-
- set(_msg)
-
- if(NOT DASHBOARDSCRIPT_BUILD_CONFIGURATION)
- set(DASHBOARDSCRIPT_BUILD_CONFIGURATION "RelWithDebInfo")
- endif()
- set(DASHBOARDSCRIPT_BUILD_CONFIGURATION "${DASHBOARDSCRIPT_BUILD_CONFIGURATION}" CACHE STRING "Build configuration to use for dashboard builds by default")
- mark_as_advanced(DASHBOARDSCRIPT_BUILD_CONFIGURATION)
-
- foreach(DASHBOARDSCRIPT_DASH_TYPE Nightly Continuous Experimental)
- # If given a cache template, configure it
- if(ARGN)
- configure_file(${ARGN}
- "${DASHBOARDSCRIPT_BASE_DIRECTORY}/GeneratedInitialCache.run${DASHBOARDSCRIPT_DASH_TYPE}.cmake"
- @ONLY)
- endif()
-
- # Actually create the script file
- configure_file(${_dashboardmoddir}/DashboardScript.cmake.in
- "${DASHBOARDSCRIPT_BASE_DIRECTORY}/run${DASHBOARDSCRIPT_DASH_TYPE}.cmake"
- @ONLY)
-
- set(_msg
- "${_msg}\n${_${DASHBOARDSCRIPT_DASH_TYPE}_cron}\"${DASHBOARDSCRIPT_CTEST_EXECUTABLE}\" -S \"${DASHBOARDSCRIPT_BASE_DIRECTORY}/run${DASHBOARDSCRIPT_DASH_TYPE}.cmake\" ${_${DASHBOARDSCRIPT_DASH_TYPE}_flags}")
-
- endforeach()
- message(STATUS "\n${_msg}\n")
- message(STATUS "")
-
- endif()
-endfunction()
Deleted: trunk/cmake/CreateImportedTarget.cmake
===================================================================
--- trunk/cmake/CreateImportedTarget.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CreateImportedTarget.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,64 +0,0 @@
-# - A smarter replacement for list(REMOVE_DUPLICATES) for library lists
-#
-# create_imported_target(<libname> [SHARED|STATIC|MODULE] [<library dependency>...]) - where
-# ${libname}_LIBRARIES is set to this library's paths.
-#
-# Removes duplicates from the list then sorts while preserving "optimized",
-# "debug", and "general" labeling
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__create_imported_target)
- return()
-endif()
-set(__create_imported_target YES)
-
-function(create_imported_target _libname)
- if(ARGN)
- list(FIND ARGN SHARED _target_shared)
- list(FIND ARGN STATIC _target_static)
- list(FIND ARGN MODULE _target_module)
-
- if(${_target_shared} GREATER -1)
- set(_target_type SHARED)
- elseif(${_target_static} GREATER -1)
- set(_target_type STATIC)
- elseif(${_target_module} GREATER -1)
- set(_target_type MODULE)
- else()
- set(_target_type UNKNOWN)
- endif()
-
- set(_deps ${ARGN})
- list(REMOVE_ITEM _deps SHARED STATIC MODULE UNKNOWN)
- else()
- set(_target_type UNKNOWN)
- set(_deps)
- endif()
-
- if(${_libname}_LIBRARIES AND NOT TARGET ${_libname}_imported)
- add_library(${_libname}_imported ${_target_type} IMPORTED)
- #message(STATUS "Library ${_libname}: lib ${${_libname}_LIBRARIES}")
- #message(STATUS "Deps: ${_deps}")
- set_target_properties(${_libname}_imported
- PROPERTIES
- IMPORTED_LOCATION
- "${${_libname}_LIBRARIES}"
- IMPORTED_LINK_INTERFACE_LIBRARIES
- "${_deps}")
- endif()
-
- if(TARGET ${_libname}_imported)
- set(${_libname}_LIBRARIES ${_libname}_imported PARENT_SCOPE)
- endif()
-endfunction()
Deleted: trunk/cmake/CreateLaunchers.cmake
===================================================================
--- trunk/cmake/CreateLaunchers.cmake 2012-07-04 20:35:57 UTC (rev 693)
+++ trunk/cmake/CreateLaunchers.cmake 2012-07-27 22:21:26 UTC (rev 694)
@@ -1,313 +0,0 @@
-# - Create launchers to set working directory, env. vars, etc.
-#
-# include(CreateLaunchers) - to make these available
-# guess_runtime_library_dirs(<outputvarname> [<extralibrary> ...])
-# create_default_target_launcher(<targetname>
-# [ARGS <args...>]
-# [FORWARD_ARGS]
-# [RUNTIME_LIBRARY_DIRS <dir...>]
-# [WORKING_DIRECTORY <dir>]
-# [ENVIRONMENT <VAR=value> [<VAR=value>...]])
-#
-# create_target_launcher(<targetname>
-# [ARGS <args...>]
-# [FORWARD_ARGS]
-# [RUNTIME_LIBRARY_DIRS <dir...>]
-# [WORKING_DIRECTORY <dir>]
-# [ENVIRONMENT <VAR=value> [<VAR=value>...]])
-#
-# create_generic_launcher(<launchername>
-# [RUNTIME_LIBRARY_DIRS <dir...>]
-# [WORKING_DIRECTORY <dir>]
-# [ENVIRONMENT <VAR=value> [<VAR=value>...]])
-# - sets GENERIC_LAUNCHER_COMMAND amd GENERIC_LAUNCHER_FAIL_REGULAR_EXPRESSION
-#
-# Requires these CMake modules:
-# ListFilter
-# ProgramFilesGlob
-# CleanDirectoryList
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__create_launchers)
- return()
-endif()
-set(__create_launchers YES)
-
-include(CleanDirectoryList)
-
-# We must run the following at "include" time, not at function call time,
-# t...
[truncated message content] |
|
From: <pat...@us...> - 2012-07-31 16:57:49
|
Revision: 704
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=704&view=rev
Author: patrickh
Date: 2012-07-31 16:57:43 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Change hard tabs to four space indentation.
Submitted by: Doug McCorkle
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/cppdom/CMakeLists.txt
trunk/test/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-07-30 15:14:17 UTC (rev 703)
+++ trunk/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
@@ -12,7 +12,7 @@
set(CPACK_PACKAGE_VERSION_MINOR "3")
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_VERSION
- "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(VERSION_UNDERSCORES "${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}")
###
@@ -21,22 +21,22 @@
# TODO this is not ideal/complete
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(arch "x86_64")
- set(ARCH_DIR lib64)
+ set(arch "x86_64")
+ set(ARCH_DIR lib64)
else()
- set(arch "x86")
- set(ARCH_DIR lib)
+ set(arch "x86")
+ set(ARCH_DIR lib)
endif()
# Define directories
set(BIN_DIR bin)
set(FLAGPOLL_INFO_DIR share/flagpoll)
if(WIN32)
- set(LIB_DIR bin)
- set(INCLUDE_DIR include)
+ set(LIB_DIR bin)
+ set(INCLUDE_DIR include)
else()
- set(LIB_DIR ${ARCH_DIR})
- set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
+ set(LIB_DIR ${ARCH_DIR})
+ set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
endif()
# Create flagpoll file
@@ -48,25 +48,25 @@
set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
if(CMAKE_COMPILER_IS_GNUCXX)
- set(cppdom_cxxflags "-Wno-deprecated")
- set(include_path_flag "-I")
- set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")
- set(lib_path_flag "-L")
+ set(cppdom_cxxflags "-Wno-deprecated")
+ set(include_path_flag "-I")
+ set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")
+ set(lib_path_flag "-L")
elseif(MSVC)
- set(include_path_flag "/I")
- set(lib_path_flag "/L")
+ set(include_path_flag "/I")
+ set(lib_path_flag "/L")
else()
- message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
+ message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
endif()
configure_file(cppdom.fpc.in "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc"
- DESTINATION ${FLAGPOLL_INFO_DIR}
- COMPONENT Development)
+ DESTINATION ${FLAGPOLL_INFO_DIR}
+ COMPONENT Development)
install(FILES cppdom-config
- DESTINATION ${BIN_DIR}
- COMPONENT Development)
+ DESTINATION ${BIN_DIR}
+ COMPONENT Development)
###
# Perform build configuration of dependencies
@@ -91,12 +91,12 @@
# Choose desired package generators
if(APPLE)
- set(CPACK_GENERATOR DragNDrop)
- set(CPACK_SOURCE_GENERATOR ZIP)
+ set(CPACK_GENERATOR DragNDrop)
+ set(CPACK_SOURCE_GENERATOR ZIP)
elseif(WIN32)
- set(CPACK_SOURCE_GENERATOR ZIP)
+ set(CPACK_SOURCE_GENERATOR ZIP)
else()
- set(CPACK_SOURCE_GENERATOR TARGZ)
+ set(CPACK_SOURCE_GENERATOR TARGZ)
endif()
# Include the packaging system now that we have it all set up
Modified: trunk/cppdom/CMakeLists.txt
===================================================================
--- trunk/cppdom/CMakeLists.txt 2012-07-30 15:14:17 UTC (rev 703)
+++ trunk/cppdom/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
@@ -8,25 +8,25 @@
configure_file(version.h.in "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY)
set(API
- config.h
- cppdom.h
- predicates.h
- shared_ptr.h
- xmlparser.h
- xmltokenizer.h
- version.h)
+ config.h
+ cppdom.h
+ predicates.h
+ shared_ptr.h
+ xmlparser.h
+ xmltokenizer.h
+ version.h)
set(EXT_API
- ext/OptionRepository.h)
+ ext/OptionRepository.h)
set(SOURCES
- cppdom.cpp
- xmlparser.cpp
- xmltokenizer.cpp
- ext/OptionRepository.cpp)
+ cppdom.cpp
+ xmlparser.cpp
+ xmltokenizer.cpp
+ ext/OptionRepository.cpp)
if(BOOST_FOUND)
- include_directories(${Boost_INCLUDE_DIRS})
- list(APPEND SOURCES SpiritParser.cpp)
- list(APPEND API SpiritParser.h)
+ include_directories(${Boost_INCLUDE_DIRS})
+ list(APPEND SOURCES SpiritParser.cpp)
+ list(APPEND API SpiritParser.h)
endif()
add_definitions(-DCPPDOM_EXPORTS)
@@ -39,13 +39,13 @@
add_library(cppdom SHARED ${API} ${EXT_API} ${SOURCES})
set_target_properties(cppdom PROPERTIES
- PUBLIC_HEADER "${API}"
- COMPILE_DEFINITIONS_DEBUG "CPPDOM_DEBUG")
+ PUBLIC_HEADER "${API}"
+ COMPILE_DEFINITIONS_DEBUG "CPPDOM_DEBUG")
install(TARGETS cppdom
- RUNTIME DESTINATION ${BIN_DIR} COMPONENT Runtime
- LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime
- ARCHIVE DESTINATION ${ARCH_DIR} COMPONENT Development
- PUBLIC_HEADER DESTINATION ${INCLUDE_DIR}/cppdom COMPONENT Development)
+ RUNTIME DESTINATION ${BIN_DIR} COMPONENT Runtime
+ LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime
+ ARCHIVE DESTINATION ${ARCH_DIR} COMPONENT Development
+ PUBLIC_HEADER DESTINATION ${INCLUDE_DIR}/cppdom COMPONENT Development)
install(FILES ${EXT_API}
- DESTINATION ${INCLUDE_DIR}/cppdom/ext
- COMPONENT Development)
+ DESTINATION ${INCLUDE_DIR}/cppdom/ext
+ COMPONENT Development)
Modified: trunk/test/CMakeLists.txt
===================================================================
--- trunk/test/CMakeLists.txt 2012-07-30 15:14:17 UTC (rev 703)
+++ trunk/test/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
@@ -1,36 +1,36 @@
find_package(cppunit)
if(CPPUNIT_FOUND)
- add_subdirectory(suite)
+ add_subdirectory(suite)
endif()
if(BUILD_TESTING)
- include_directories(.)
+ include_directories(.)
- # maketree
- add_executable(maketree maketree.cpp)
- target_link_libraries(maketree cppdom)
- add_test(NAME maketree
- COMMAND maketree)
+ # maketree
+ add_executable(maketree maketree.cpp)
+ target_link_libraries(maketree cppdom)
+ add_test(NAME maketree
+ COMMAND maketree)
- # nodetest
- include(CopyResourcesToBuildTree)
- add_executable(nodetest nodetest.cpp game.xml)
- set_target_properties(nodetest PROPERTIES RESOURCE "game.xml")
- target_link_libraries(nodetest cppdom)
- copy_resources_to_build_tree(nodetest)
- add_test(NAME nodetest
- COMMAND nodetest)
- set_tests_properties(nodetest PROPERTIES
- FAIL_REGULAR_EXPRESSION "[eE]rror"
- PASS_REGULAR_EXPRESSION "in name: bokbokbok")
+ # nodetest
+ include(CopyResourcesToBuildTree)
+ add_executable(nodetest nodetest.cpp game.xml)
+ set_target_properties(nodetest PROPERTIES RESOURCE "game.xml")
+ target_link_libraries(nodetest cppdom)
+ copy_resources_to_build_tree(nodetest)
+ add_test(NAME nodetest
+ COMMAND nodetest)
+ set_tests_properties(nodetest PROPERTIES
+ FAIL_REGULAR_EXPRESSION "[eE]rror"
+ PASS_REGULAR_EXPRESSION "in name: bokbokbok")
- # parsetest
- add_executable(parsetest parsetest.cpp)
- target_link_libraries(parsetest cppdom)
- foreach(testfile game.xml hamlet.xml nodetest.xml test.xml)
- add_test(NAME parsetest-${testfile}
- COMMAND parsetest "${CMAKE_CURRENT_SOURCE_DIR}/${testfile}")
- set_tests_properties(parsetest-${testfile} PROPERTIES
- FAIL_REGULAR_EXPRESSION "[eE]rror")
- endforeach()
+ # parsetest
+ add_executable(parsetest parsetest.cpp)
+ target_link_libraries(parsetest cppdom)
+ foreach(testfile game.xml hamlet.xml nodetest.xml test.xml)
+ add_test(NAME parsetest-${testfile}
+ COMMAND parsetest "${CMAKE_CURRENT_SOURCE_DIR}/${testfile}")
+ set_tests_properties(parsetest-${testfile} PROPERTIES
+ FAIL_REGULAR_EXPRESSION "[eE]rror")
+ endforeach()
endif()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2012-07-31 17:48:35
|
Revision: 705
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=705&view=rev
Author: patrickh
Date: 2012-07-31 17:48:27 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
>From the submission:
* Adds helper files to the CMake build to make it easier to find in other
CMake projects
* Adds versioned library files back to the build
* Places the flagpoll file in the lib directory rather than the share
* directory
Submitted by: Doug McCorkle
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/cppdom/CMakeLists.txt
Added Paths:
-----------
trunk/Usecppdom.cmake.in
trunk/cmake/Findcppdom.cmake
trunk/cppdomBuildTreeSettings.cmake.in
trunk/cppdomConfig.cmake.in
trunk/cppdomConfigVersion.cmake.in
Removed Paths:
-------------
trunk/cmake/FindCPPDOM.cmake
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
+++ trunk/CMakeLists.txt 2012-07-31 17:48:27 UTC (rev 705)
@@ -30,7 +30,7 @@
# Define directories
set(BIN_DIR bin)
-set(FLAGPOLL_INFO_DIR share/flagpoll)
+
if(WIN32)
set(LIB_DIR bin)
set(INCLUDE_DIR include)
@@ -39,6 +39,8 @@
set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
endif()
+set(FLAGPOLL_INFO_DIR ${LIB_DIR}/flagpoll)
+
# Create flagpoll file
set(provides "cppdom")
set(version "${CPACK_PACKAGE_VERSION}")
@@ -72,9 +74,13 @@
# Perform build configuration of dependencies
###
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
include(CTest)
-find_package(Boost)
+option( BUILD_SPIRIT_PARSER "Set to ON to build the SpiritParser based on the Boost Spirit library." OFF )
+if(BUILD_SPIRIT_PARSER)
+ find_package(Boost)
+endif(BUILD_SPIRIT_PARSER)
###
# Build the project
@@ -105,3 +111,43 @@
###
# End Packaging
###
+
+# Install the CMake find script for cppdom
+install( FILES "cmake/Findcppdom.cmake"
+ DESTINATION "share/${CMAKE_PROJECT_NAME}/extra"
+ COMPONENT Development )
+
+#
+# Create and install all of the auto find tools
+# =============================================
+
+# Add all targets to the build-tree export set
+export(TARGETS cppdom
+ FILE "${PROJECT_BINARY_DIR}/${LIB_DIR}/cppdomLibraryDepends.cmake")
+
+# Export the package for use from the build-tree
+# (this registers the build-tree with a global CMake-registry)
+export(PACKAGE cppdom)
+
+# Create a cppdomBuildTreeSettings.cmake file for the use from the build tree
+configure_file(cppdomBuildTreeSettings.cmake.in
+ "${PROJECT_BINARY_DIR}/${LIB_DIR}/cppdomBuildTreeSettings.cmake" @ONLY)
+
+configure_file(cppdomConfigVersion.cmake.in
+ "${PROJECT_BINARY_DIR}/${LIB_DIR}/cppdomConfigVersion.cmake" @ONLY)
+configure_file(Usecppdom.cmake.in
+ "${PROJECT_BINARY_DIR}/${LIB_DIR}/Usecppdom.cmake" @ONLY)
+
+# Install the export set for use with the install-tree
+install(EXPORT cppdom-targets DESTINATION ${LIB_DIR})
+
+include( CMakePackageConfigHelpers )
+configure_package_config_file(
+ cppdomConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/cppdomConfig.cmake
+ INSTALL_DESTINATION ${LIB_DIR}
+ PATH_VARS INCLUDE_DIR )
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/cppdomConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/cppdomConfigVersion.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${LIB_DIR}/Usecppdom.cmake
+ DESTINATION ${LIB_DIR} )
Added: trunk/Usecppdom.cmake.in
===================================================================
--- trunk/Usecppdom.cmake.in (rev 0)
+++ trunk/Usecppdom.cmake.in 2012-07-31 17:48:27 UTC (rev 705)
@@ -0,0 +1,50 @@
+#
+# This module is provided as cppdom_USE_FILE by cppdomConfig.cmake. It can
+# be INCLUDEd in a project to load the needed compiler and linker
+# settings to use cppdom.
+#
+
+IF(NOT cppdom_USE_FILE_INCLUDED)
+ SET(cppdom_USE_FILE_INCLUDED 1)
+
+ # Update CMAKE_MODULE_PATH so includes work.
+ #SET (CMAKE_MODULE_PATH
+ # ${CMAKE_MODULE_PATH}
+ # ${cppdom_CMAKE_DIR})
+
+ # Add compiler flags needed to use cppdom.
+ #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cppdom_REQUIRED_C_FLAGS}")
+ #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cppdom_REQUIRED_CXX_FLAGS}")
+ #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${cppdom_REQUIRED_EXE_LINKER_FLAGS}")
+ #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${cppdom_REQUIRED_SHARED_LINKER_FLAGS}")
+ #SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${cppdom_REQUIRED_MODULE_LINKER_FLAGS}")
+
+ # Add include directories needed to use cppdom.
+ INCLUDE_DIRECTORIES(${cppdom_INCLUDE_DIRS})
+
+ENDIF(NOT cppdom_USE_FILE_INCLUDED)
+#
+# This module is provided as cppdom_USE_FILE by cppdomConfig.cmake. It can
+# be INCLUDEd in a project to load the needed compiler and linker
+# settings to use cppdom.
+#
+
+IF(NOT cppdom_USE_FILE_INCLUDED)
+ SET(cppdom_USE_FILE_INCLUDED 1)
+
+ # Update CMAKE_MODULE_PATH so includes work.
+ #SET (CMAKE_MODULE_PATH
+ # ${CMAKE_MODULE_PATH}
+ # ${cppdom_CMAKE_DIR})
+
+ # Add compiler flags needed to use cppdom.
+ #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${cppdom_REQUIRED_C_FLAGS}")
+ #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cppdom_REQUIRED_CXX_FLAGS}")
+ #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${cppdom_REQUIRED_EXE_LINKER_FLAGS}")
+ #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${cppdom_REQUIRED_SHARED_LINKER_FLAGS}")
+ #SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${cppdom_REQUIRED_MODULE_LINKER_FLAGS}")
+
+ # Add include directories needed to use cppdom.
+ INCLUDE_DIRECTORIES(${cppdom_INCLUDE_DIRS})
+
+ENDIF(NOT cppdom_USE_FILE_INCLUDED)
Property changes on: trunk/Usecppdom.cmake.in
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: trunk/cmake/FindCPPDOM.cmake
===================================================================
--- trunk/cmake/FindCPPDOM.cmake 2012-07-31 16:57:43 UTC (rev 704)
+++ trunk/cmake/FindCPPDOM.cmake 2012-07-31 17:48:27 UTC (rev 705)
@@ -1,176 +0,0 @@
-# - try to find CPPDOM library
-# Optionally uses Flagpoll and FindFlagpoll.cmake
-#
-# CPPDOM_LIBRARY_DIR, library search path
-# CPPDOM_INCLUDE_DIR, include search path
-# CPPDOM_LIBRARY, the library to link against
-# CPPDOM_CXX_FLAGS
-# CPPDOM_FOUND, If false, do not try to use this library.
-#
-# Useful configuration variables you might want to add to your cache:
-# CPPDOM_ROOT_DIR - A directory prefix to search
-# (a path that contains include/ as a subdirectory)
-# CPPDOM_ADDITIONAL_VERSIONS - Additional versions (outside of 0.7.8 to 1.0.0)
-# to use when constructing search names and paths
-#
-# This script will use Flagpoll, if found, to provide hints to the location
-# of this library, but does not use the compiler flags returned by Flagpoll
-# directly.
-#
-# VR Juggler requires this package, so this Find script takes that into
-# account when determining where to search for the desired files.
-# The VJ_BASE_DIR environment variable is searched (preferentially)
-# when searching for this package, so most sane VR Juggler build environments
-# should "just work." Note that you need to manually re-run CMake if you
-# change this environment variable, because it cannot auto-detect this change
-# and trigger an automatic re-run.
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rp...@ia...> <ab...@ry...>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(_HUMAN "cppdom")
-set(_HEADER cppdom/cppdom.h)
-set(_FP_PKG_NAME cppdom)
-
-set(CPPDOM_VERSIONS
- ${CPPDOM_ADDITIONAL_VERSIONS}
- 1.1.2
- 1.1.1
- 1.1.0
- 1.0.3
- 1.0.2
- 1.0.1
- 1.0.0
- 0.7.10
- 0.7.9
- 0.7.8)
-set(CPPDOM_DIRS)
-set(CPPDOM_RELEASE_LIB_NAMES)
-set(CPPDOM_DEBUG_LIB_NAMES)
-foreach(_version ${CPPDOM_VERSIONS})
- string(REGEX REPLACE "[-\\.]" "_" _versionclean ${_version})
- list(APPEND CPPDOM_DIRS cppdom-${_version})
- list(APPEND CPPDOM_HEADER_DIRS include/cppdom-${_version})
- list(APPEND CPPDOM_RELEASE_LIB_NAMES cppdom-${_versionclean})
- list(APPEND CPPDOM_DEBUG_LIB_NAMES cppdom_d-${_versionclean})
-endforeach()
-
-include(SelectLibraryConfigurations)
-include(CreateImportedTarget)
-include(CleanLibraryList)
-include(CleanDirectoryList)
-
-if(CPPDOM_INCLUDE_DIRS AND CPPDOM_LIBRARIES)
- # in cache already
- set(CPPDOM_FIND_QUIETLY TRUE)
-endif()
-
-# Try flagpoll.
-find_package(Flagpoll QUIET)
-
-if(FLAGPOLL)
- flagpoll_get_include_dirs(${_FP_PKG_NAME} NO_DEPS)
- flagpoll_get_library_dirs(${_FP_PKG_NAME} NO_DEPS)
- flagpoll_get_library_names(${_FP_PKG_NAME} NO_DEPS)
-endif()
-
-set(CPPDOM_ROOT_DIR
- "${CPPDOM_ROOT_DIR}"
- CACHE
- PATH
- "Root directory to search for CPPDOM")
-if(DEFINED VRJUGGLER22_ROOT_DIR)
- mark_as_advanced(CPPDOM_ROOT_DIR)
-endif()
-if(NOT CPPDOM_ROOT_DIR)
- if(VRJUGGLER22_ROOT_DIR)
- set(CPPDOM_ROOT_DIR "${VRJUGGLER22_ROOT_DIR}")
- elseif(VRJUGGLER30_ROOT_DIR)
- set(CPPDOM_ROOT_DIR "${VRJUGGLER30_ROOT_DIR}")
- endif()
-endif()
-
-set(_ROOT_DIR "${CPPDOM_ROOT_DIR}")
-
-find_path(CPPDOM_INCLUDE_DIR
- ${_HEADER}
- HINTS
- ${_ROOT_DIR}
- ${${_FP_PKG_NAME}_FLAGPOLL_INCLUDE_DIRS}
- PATHS
- PATH_SUFFIXES
- ${CPPDOM_DIRS}
- ${CPPDOM_HEADER_DIRS}
- include
- DOC
- "Path to ${_HUMAN} includes root")
-
-find_library(CPPDOM_LIBRARY_RELEASE
- NAMES
- ${CPPDOM_RELEASE_LIB_NAMES}
- ${${_FP_PKG_NAME}_FLAGPOLL_LIBRARY_NAMES}
- HINTS
- ${_ROOT_DIR}
- ${${_FP_PKG_NAME}_FLAGPOLL_LIBRARY_DIRS}
- PATH_SUFFIXES
- ${_VRJ_LIBSUFFIXES}
- DOC
- "${_HUMAN} library full path")
-
-find_library(CPPDOM_LIBRARY_DEBUG
- NAMES
- ${CPPDOM_DEBUG_LIB_NAMES}
- HINTS
- ${_ROOT_DIR}
- ${${_FP_PKG_NAME}_FLAGPOLL_LIBRARY_DIRS}
- PATH_SUFFIXES
- ${_VRJ_LIBDSUFFIXES}
- DOC
- "${_HUMAN} debug library full path")
-
-# Fallback to same library name but in the debug folder
-if(NOT CPPDOM_LIBRARY_DEBUG)
- find_library(CPPDOM_LIBRARY_DEBUG
- NAMES
- ${CPPDOM_LIB_NAMES}
- HINTS
- ${CPPDOM_INCLUDE_DIR}/../
- ${${_FP_PKG_NAME}_FLAGPOLL_LIBRARY_DIRS}
- PATH_SUFFIXES
- ${_VRJ_LIBDSUFFIXES_ONLY}
- NO_DEFAULT_PATH
- DOC
- "${_HUMAN} debug library full path")
-endif()
-
-if(CPPDOM_LIBRARY_RELEASE OR CPPDOM_LIBRARY_DEBUG)
- select_library_configurations(CPPDOM)
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set xxx_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CPPDOM
- DEFAULT_MSG
- CPPDOM_LIBRARY
- CPPDOM_INCLUDE_DIR)
-
-if(CPPDOM_FOUND)
- set(CPPDOM_INCLUDE_DIRS ${CPPDOM_INCLUDE_DIR})
- if(MSVC)
- set(CPPDOM_CXX_FLAGS "/wd4290")
- endif()
-
- mark_as_advanced(CPPDOM_ROOT_DIR)
-endif()
-
-mark_as_advanced(CPPDOM_LIBRARY_RELEASE
- CPPDOM_LIBRARY_DEBUG
- CPPDOM_INCLUDE_DIR)
Added: trunk/cmake/Findcppdom.cmake
===================================================================
--- trunk/cmake/Findcppdom.cmake (rev 0)
+++ trunk/cmake/Findcppdom.cmake 2012-07-31 17:48:27 UTC (rev 705)
@@ -0,0 +1,45 @@
+# - Find a cppdom installation or build tree.
+# The following variables are set if cppdom is found. If cppdom is not
+# found, cppdom_FOUND is set to false.
+# cppdom_FOUND - Set to true when cppdom is found.
+# cppdom_USE_FILE - CMake file to use cppdom.
+# cppdom_MAJOR_VERSION - The cppdom major version number.
+# cppdom_MINOR_VERSION - The cppdom minor version number
+# (odd non-release).
+# cppdom_BUILD_VERSION - The cppdom patch level
+# (meaningless for odd minor).
+# cppdom_INCLUDE_DIRS - Include directories for cppdom
+# cppdom_LIBRARY_DIRS - Link directories for cppdom libraries
+
+# The following cache entries must be set by the user to locate cppdom:
+# cppdom_DIR - The directory containing cppdomConfig.cmake.
+# This is either the root of the build tree,
+# or the lib directory. This is the
+# only cache entry.
+
+
+# Assume not found.
+SET(cppdom_FOUND 0)
+
+# Construct consitent error messages for use below.
+SET(cppdom_DIR_DESCRIPTION "directory containing cppdomConfig.cmake. This is either the root of the build tree, or PREFIX/lib for an installation.")
+SET(cppdom_DIR_MESSAGE "cppdom not found. Set the cppdom_DIR cmake cache entry to the ${cppdom_DIR_DESCRIPTION}")
+
+# Use the Config mode of the find_package() command to find cppdomConfig.
+# If this succeeds (possibly because cppdom_DIR is already set), the
+# command will have already loaded cppdomConfig.cmake and set cppdom_FOUND.
+IF(NOT cppdom_FOUND)
+ FIND_PACKAGE(cppdom QUIET NO_MODULE)
+ENDIF(NOT cppdom_FOUND)
+
+#-----------------------------------------------------------------------------
+IF(NOT cppdom_FOUND)
+ # cppdom not found, explain to the user how to specify its location.
+ IF(cppdom_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR ${cppdom_DIR_MESSAGE})
+ ELSE(cppdom_FIND_REQUIRED)
+ IF(NOT cppdom_FIND_QUIETLY)
+ MESSAGE(STATUS ${cppdom_DIR_MESSAGE})
+ ENDIF(NOT cppdom_FIND_QUIETLY)
+ ENDIF(cppdom_FIND_REQUIRED)
+ENDIF(NOT cppdom_FOUND)
Modified: trunk/cppdom/CMakeLists.txt
===================================================================
--- trunk/cppdom/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
+++ trunk/cppdom/CMakeLists.txt 2012-07-31 17:48:27 UTC (rev 705)
@@ -23,7 +23,7 @@
xmltokenizer.cpp
ext/OptionRepository.cpp)
-if(BOOST_FOUND)
+if(BOOST_FOUND AND BUILD_SPIRIT_PARSER)
include_directories(${Boost_INCLUDE_DIRS})
list(APPEND SOURCES SpiritParser.cpp)
list(APPEND API SpiritParser.h)
@@ -38,13 +38,17 @@
add_library(cppdom SHARED ${API} ${EXT_API} ${SOURCES})
-set_target_properties(cppdom PROPERTIES
- PUBLIC_HEADER "${API}"
+set_target_properties(cppdom PROPERTIES PUBLIC_HEADER "${API}"
COMPILE_DEFINITIONS_DEBUG "CPPDOM_DEBUG")
+set_target_properties( cppdom PROPERTIES VERSION ${CPACK_PACKAGE_VERSION} )
+set_target_properties( cppdom PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION} )
+set_target_properties( cppdom PROPERTIES PROJECT_LABEL "Lib cppdom" )
+
install(TARGETS cppdom
+ EXPORT cppdom-targets
RUNTIME DESTINATION ${BIN_DIR} COMPONENT Runtime
- LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime
- ARCHIVE DESTINATION ${ARCH_DIR} COMPONENT Development
+ LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime
+ ARCHIVE DESTINATION ${ARCH_DIR} COMPONENT Development
PUBLIC_HEADER DESTINATION ${INCLUDE_DIR}/cppdom COMPONENT Development)
install(FILES ${EXT_API}
DESTINATION ${INCLUDE_DIR}/cppdom/ext
Added: trunk/cppdomBuildTreeSettings.cmake.in
===================================================================
--- trunk/cppdomBuildTreeSettings.cmake.in (rev 0)
+++ trunk/cppdomBuildTreeSettings.cmake.in 2012-07-31 17:48:27 UTC (rev 705)
@@ -0,0 +1,6 @@
+set(cppdom_INCLUDE_DIRS
+ "@PROJECT_SOURCE_DIR@"
+ "@PROJECT_BINARY_DIR@")
+set(cppdom_INCLUDE_DIRS
+ "@PROJECT_SOURCE_DIR@"
+ "@PROJECT_BINARY_DIR@")
Property changes on: trunk/cppdomBuildTreeSettings.cmake.in
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cppdomConfig.cmake.in
===================================================================
--- trunk/cppdomConfig.cmake.in (rev 0)
+++ trunk/cppdomConfig.cmake.in 2012-07-31 17:48:27 UTC (rev 705)
@@ -0,0 +1,54 @@
+# - Config file for the cppdom package
+# It defines the following variables
+# cppdom_INCLUDE_DIRS - include directories for cppdom
+# cppdom_LIBRARIES - libraries to link against
+
+@PACKAGE_INIT@
+
+# These are IMPORTED targets created by cppdomLibraryDepends.cmake
+set(cppdom_LIBRARIES "cppdom" )
+
+# Compute paths
+# get_filename_component(cppdom_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS "${PACKAGE_PREFIX_DIR}/CMakeCache.txt")
+ # In build tree
+ include("${PACKAGE_PREFIX_DIR}/lib/cppdomBuildTreeSettings.cmake")
+ # Our library dependencies (contains definitions for IMPORTED targets)
+ include("${PACKAGE_PREFIX_DIR}/lib/cppdomLibraryDepends.cmake")
+else()
+ set_and_check(cppdom_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@INCLUDE_DIR@")
+ # The cppdom targets file.
+ if(EXISTS "${PACKAGE_PREFIX_DIR}/lib/cppdom-targets.cmake")
+ include("${PACKAGE_PREFIX_DIR}/lib/cppdom-targets.cmake")
+ endif()
+endif()
+
+# The location of the Usecppdom.cmake file.
+set(cppdom_USE_FILE "${PACKAGE_PREFIX_DIR}/lib/Usecppdom.cmake")
+# - Config file for the cppdom package
+# It defines the following variables
+# cppdom_INCLUDE_DIRS - include directories for cppdom
+# cppdom_LIBRARIES - libraries to link against
+
+@PACKAGE_INIT@
+
+# These are IMPORTED targets created by cppdomLibraryDepends.cmake
+set(cppdom_LIBRARIES "cppdom" )
+
+# Compute paths
+# get_filename_component(cppdom_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS "${PACKAGE_PREFIX_DIR}/CMakeCache.txt")
+ # In build tree
+ include("${PACKAGE_PREFIX_DIR}/lib/cppdomBuildTreeSettings.cmake")
+ # Our library dependencies (contains definitions for IMPORTED targets)
+ include("${PACKAGE_PREFIX_DIR}/lib/cppdomLibraryDepends.cmake")
+else()
+ set_and_check(cppdom_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@INCLUDE_DIR@")
+ # The cppdom targets file.
+ if(EXISTS "${PACKAGE_PREFIX_DIR}/lib/cppdom-targets.cmake")
+ include("${PACKAGE_PREFIX_DIR}/lib/cppdom-targets.cmake")
+ endif()
+endif()
+
+# The location of the Usecppdom.cmake file.
+set(cppdom_USE_FILE "${PACKAGE_PREFIX_DIR}/lib/Usecppdom.cmake")
Property changes on: trunk/cppdomConfig.cmake.in
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/cppdomConfigVersion.cmake.in
===================================================================
--- trunk/cppdomConfigVersion.cmake.in (rev 0)
+++ trunk/cppdomConfigVersion.cmake.in 2012-07-31 17:48:27 UTC (rev 705)
@@ -0,0 +1,22 @@
+set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
+set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
Property changes on: trunk/cppdomConfigVersion.cmake.in
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X