diff --git a/apo/CMakeLists.txt b/apo/CMakeLists.txt
deleted file mode 100644
index aa3fe000f0cc9f9bdf8dd7de57cb8e0977a65fde..0000000000000000000000000000000000000000
--- a/apo/CMakeLists.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-set(CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../")
-set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Arduino.cmake) # Arduino Toolchain
-set(CMAKE_MODULE_PATH    ${CMAKE_SOURCE_DIR}/cmake/modules)  # CMake module search path
-
-string(REGEX REPLACE ".*/" "" PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR})
-project(${PROJECT_NAME} C CXX)
-
-set (CMAKE_CXX_SOURCE_FILE_EXTENSIONS pde)
-
-find_package(Arduino 22 REQUIRED)
-
-if (NOT DEFINED BOARD)
-	message(STATUS "board not defined, assuming mega, use cmake -DBOARD=mega2560 , etc. to specify")
-	set(BOARD "mega")
-endif()
-message(STATUS "Board configured as: ${BOARD}")
-
-# need to configure based on host operating system
-set(${PROJECT_NAME}_PORT COM2)
-set(${PROJECT_NAME}_SERIAL putty -serial COM2 -sercfg 57600,8,n,1,X )
-	
-include_directories(
-${ARDUINO_LIBRARIES_PATH}/Wire
-${CMAKE_SOURCE_DIR}/libraries/APO
-${CMAKE_SOURCE_DIR}/libraries/AP_Common
-${CMAKE_SOURCE_DIR}/libraries/FastSerial
-${CMAKE_SOURCE_DIR}/libraries/ModeFilter
-${CMAKE_SOURCE_DIR}/libraries/AP_Compass
-${CMAKE_SOURCE_DIR}/libraries/AP_RangeFinder
-${CMAKE_SOURCE_DIR}/libraries/AP_GPS
-${CMAKE_SOURCE_DIR}/libraries/AP_IMU
-${CMAKE_SOURCE_DIR}/libraries/AP_ADC
-${CMAKE_SOURCE_DIR}/libraries/AP_DCM
-${CMAKE_SOURCE_DIR}/libraries/APM_RC
-${CMAKE_SOURCE_DIR}/libraries/GCS_MAVLink
-${CMAKE_SOURCE_DIR}/libraries/APM_BMP085
-)
-
-add_subdirectory(../libraries "${CMAKE_CURRENT_BINARY_DIR}/libs")
-
-set(${PROJECT_NAME}_BOARD ${BOARD})
-file(GLOB ${PROJECT_NAME}_SKETCHES *.pde)
-file(GLOB ${PROJECT_NAME}_SRCS *.cpp)
-file(GLOB ${PROJECT_NAME}_HDRS *.h)
-set(${PROJECT_NAME}_LIBS
-	c
-    m
-    APO
-    FastSerial
-    AP_Common
-    GCS_MAVLink
-    AP_GPS
-    APM_RC
-    AP_DCM
-    AP_ADC
-    AP_Compass
-    AP_IMU
-    AP_RangeFinder
-    APM_BMP085
-	ModeFilter
-)
-
-generate_arduino_firmware(${PROJECT_NAME})
-
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.hex 
-	DESTINATION bin
-	)
diff --git a/cmake/PdeP.jar b/cmake/PdeP.jar
deleted file mode 100644
index ae76f9b762e0726a1fc249243eadb49b3b69cd6f..0000000000000000000000000000000000000000
Binary files a/cmake/PdeP.jar and /dev/null differ
diff --git a/cmake/arkcmake/.gitignore b/cmake/arkcmake/.gitignore
deleted file mode 100644
index b8959c72213232194d8cd8d24fce7161e3d8737c..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.swp
-*.pyc
-.DS_Store
-arkcmake
diff --git a/cmake/arkcmake/COPYING b/cmake/arkcmake/COPYING
deleted file mode 100644
index 94a9ed024d3859793618152ea559a168bbcbb5e2..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/cmake/arkcmake/DefineCMakeDefaults.cmake b/cmake/arkcmake/DefineCMakeDefaults.cmake
deleted file mode 100644
index 72893c3c9befec929f13d56cd362bc2ac256cfb6..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/DefineCMakeDefaults.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# Always include srcdir and builddir in include path
-# This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in
-# about every subdir
-# since cmake 2.4.0
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-# Put the include dirs which are in the source or build tree
-# before all other include dirs, so the headers in the sources
-# are prefered over the already installed ones
-# since cmake 2.4.1
-set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
-
-# Use colored output
-# since cmake 2.4.0
-set(CMAKE_COLOR_MAKEFILE ON)
-
-# Define the generic version of the libraries here
-set(GENERIC_LIB_VERSION "0.1.0")
-set(GENERIC_LIB_SOVERSION "0")
-
-# Set the default build type to release with debug info
-if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo
-    CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-  )
-endif (NOT CMAKE_BUILD_TYPE)
diff --git a/cmake/arkcmake/DefineCompilerFlags.cmake b/cmake/arkcmake/DefineCompilerFlags.cmake
deleted file mode 100644
index d43c454bef4722762684feedf45796eba1a8df3d..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/DefineCompilerFlags.cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-# define system dependent compiler flags
-
-include(CheckCCompilerFlag)
-include(MacroCheckCCompilerFlagSSP)
-
-if (UNIX AND NOT WIN32)
-    #
-    # Define GNUCC compiler flags
-    #
-    if (${CMAKE_C_COMPILER_ID} MATCHES GNU)
-        # add -Wconversion ?
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
-
-        # with -fPIC
-        check_c_compiler_flag("-fPIC" WITH_FPIC)
-        if (WITH_FPIC)
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-        endif (WITH_FPIC)
-
-        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
-        if (WITH_STACK_PROTECTOR)
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
-        endif (WITH_STACK_PROTECTOR)
-
-        check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
-        if (WITH_FORTIFY_SOURCE)
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
-        endif (WITH_FORTIFY_SOURCE)
-    endif (${CMAKE_C_COMPILER_ID} MATCHES GNU)
-
-    #
-    # Check for large filesystem support
-    #
-    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        # with large file support
-        execute_process(
-            COMMAND
-                getconf LFS64_CFLAGS
-            OUTPUT_VARIABLE
-                _lfs_CFLAGS
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    else (CMAKE_SIZEOF_VOID_P MATCHES "8")
-        # with large file support
-        execute_process(
-            COMMAND
-                getconf LFS_CFLAGS
-            OUTPUT_VARIABLE
-                _lfs_CFLAGS
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    if (_lfs_CFLAGS)
-        string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_lfs_CFLAGS}")
-    endif (_lfs_CFLAGS)
-
-endif (UNIX AND NOT WIN32)
-
-if (MSVC)
-    # Use secure functions by defaualt and suppress warnings about
-    #"deprecated" functions
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
-endif (MSVC)
diff --git a/cmake/arkcmake/DefineInstallationPaths.cmake b/cmake/arkcmake/DefineInstallationPaths.cmake
deleted file mode 100644
index d857871e830e0db06221a37544909ba65d84ceea..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/DefineInstallationPaths.cmake
+++ /dev/null
@@ -1,104 +0,0 @@
-if (WIN32)
-  # Same same
-  set(BIN_INSTALL_DIR "bin" CACHE PATH "-")
-  set(SBIN_INSTALL_DIR "." CACHE PATH "-")
-  set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
-  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
-  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
-  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
-  set(ICON_INSTALL_DIR "." CACHE PATH "-")
-  set(SOUND_INSTALL_DIR "." CACHE PATH "-")
-  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
-elseif (UNIX OR OS2)
-  IF (NOT APPLICATION_NAME)
-    MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
-    SET(APPLICATION_NAME ${PROJECT_NAME})
-  ENDIF (NOT APPLICATION_NAME)
-
-  # Suffix for Linux
-  SET(LIB_SUFFIX
-    CACHE STRING "Define suffix of directory name (32/64)"
-  )
-
-  SET(EXEC_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}"
-    CACHE PATH  "Base directory for executables and libraries"
-  )
-  SET(SHARE_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}/share"
-    CACHE PATH "Base directory for files which go to share/"
-  )
-  SET(DATA_INSTALL_PREFIX
-    "${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}"
-    CACHE PATH "The parent directory where applications can install their data")
-
-  # The following are directories where stuff will be installed to
-  SET(BIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/bin"
-    CACHE PATH "The ${APPLICATION_NAME} binary install dir (default prefix/bin)"
-  )
-  SET(SBIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/sbin"
-    CACHE PATH "The ${APPLICATION_NAME} sbin install dir (default prefix/sbin)"
-  )
-  SET(LIB_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
-  )
-  SET(LIBEXEC_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/libexec"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
-  )
-  SET(PLUGIN_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/${APPLICATION_NAME}"
-    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_NAME})"
-  )
-  SET(INCLUDE_INSTALL_DIR
-    "${CMAKE_INSTALL_PREFIX}/include"
-    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
-  )
-
-  SET(DATA_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}"
-    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_NAME})"
-  )
-  SET(HTML_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/doc/HTML"
-    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
-  )
-  SET(ICON_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/icons"
-    CACHE PATH "The icon install dir (default data/icons/)"
-  )
-  SET(SOUND_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/sounds"
-    CACHE PATH "The install dir for sound files (default data/sounds)"
-  )
-
-  SET(LOCALE_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/locale"
-    CACHE PATH "The install dir for translations (default prefix/share/locale)"
-  )
-
-  SET(XDG_APPS_DIR
-    "${SHARE_INSTALL_PREFIX}/applications/"
-    CACHE PATH "The XDG apps dir"
-  )
-  SET(XDG_DIRECTORY_DIR
-    "${SHARE_INSTALL_PREFIX}/desktop-directories"
-    CACHE PATH "The XDG directory"
-  )
-
-  SET(SYSCONF_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/etc"
-    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
-  )
-  SET(MAN_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/man"
-    CACHE PATH "The ${APPLICATION_NAME} man install dir (default prefix/man)"
-  )
-  SET(INFO_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/info"
-    CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
-  )
-endif ()
diff --git a/cmake/arkcmake/DefinePlatformDefaults.cmake b/cmake/arkcmake/DefinePlatformDefaults.cmake
deleted file mode 100644
index 502d936b6f513565acca5f574d52686ee36ff63c..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/DefinePlatformDefaults.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# Set system vars
-
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(LINUX TRUE)
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    set(FREEBSD TRUE)
-    set(BSD TRUE)
-endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-
-if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-    set(OPENBSD TRUE)
-    set(BSD TRUE)
-endif (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-
-if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-    set(NETBSD TRUE)
-    set(BSD TRUE)
-endif (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-
-if (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
-    set(SOLARIS TRUE)
-endif (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
-
-if (CMAKE_SYSTEM_NAME MATCHES "OS2")
-    set(OS2 TRUE)
-endif (CMAKE_SYSTEM_NAME MATCHES "OS2")
diff --git a/cmake/arkcmake/FindARKCOMM.cmake b/cmake/arkcmake/FindARKCOMM.cmake
deleted file mode 100644
index a25fe0e5a48efa531629412cc8fcfa3572094083..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindARKCOMM.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# - Try to find  ARKCOMM
-# Once done, this will define
-#
-#  ARKCOMM_FOUND - system has scicoslab 
-#  ARKCOMM_INCLUDE_DIRS - the scicoslab include directories
-#  ARKCOMM_LIBRARIES - libraries to link to
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(ARKCOMM)
-
-# Include dir
-find_path(ARKCOMM_INCLUDE_DIR
-	NAMES arkcomm/AsyncSerial.hpp
-	PATHS ${COMMON_INCLUDE_PATHS_ARKCOMM}
-)
-
-# the library itself
-find_library(ARKCOMM_LIBRARY
-	NAMES arkcomm
-	PATHS ${COMMON_LIBRARY_PATHS_ARKCOMM}
-)
-
-# the import file
-find_path(ARKCOMM_LIBRARY_DIR
-	NAMES arkcomm/arkcomm-targets.cmake
-	PATHS ${COMMON_LIBRARY_PATHS_ARKCOMM}
-)
-set(ARKCOMM_LIB_IMPORT ${ARKCOMM_LIBRARY_DIR}/arkcomm/arkcomm-targets.cmake)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(ARKCOMM_PROCESS_INCLUDES ARKCOMM_INCLUDE_DIR)
-set(ARKCOMM_PROCESS_LIBS ARKCOMM_LIBRARY ARKCOMM_LIBRARIES)
-libfind_process(ARKCOMM)
diff --git a/cmake/arkcmake/FindARKMATH.cmake b/cmake/arkcmake/FindARKMATH.cmake
deleted file mode 100644
index 1ad3a511036f55e30d0aa7846a58e15fe9e41911..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindARKMATH.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# - Try to find  ARKMATH
-# Once done, this will define
-#
-#  ARKMATH_FOUND - system has scicoslab 
-#  ARKMATH_INCLUDE_DIRS - the scicoslab include directories
-#  ARKMATH_LIBRARIES - libraries to link to
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(ARKMATH)
-
-# Include dir
-find_path(ARKMATH_INCLUDE_DIR
-	NAMES arkmath/storage_adaptors.hpp
-	PATHS ${COMMON_INCLUDE_PATHS_ARKMATH}
-)
-
-# data dir
-find_path(ARKMATH_DATA_DIR_SEARCH
-	NAMES arkmath/data/WMM.COF
-	PATHS ${COMMON_DATA_PATHS_ARKMATH}
-)
-set(ARKMATH_DATA_DIR ${ARKMATH_DATA_DIR_SEARCH}/arkmath/data)
-
-# the library itself
-find_library(ARKMATH_LIBRARY
-	NAMES arkmath
-	PATHS ${COMMON_LIBRARY_PATHS_ARKMATH}
-)
-
-# the import file
-find_path(ARKMATH_LIBRARY_DIR
-	NAMES arkmath/arkmath-targets.cmake
-	PATHS ${COMMON_LIBRARY_PATHS_ARKMATH}
-)
-set(ARKMATH_LIB_IMPORT ${ARKMATH_LIBRARY_DIR}/arkmath/arkmath-targets.cmake)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(ARKMATH_PROCESS_INCLUDES ARKMATH_INCLUDE_DIR)
-set(ARKMATH_PROCESS_LIBS ARKMATH_LIBRARY ARKMATH_LIBRARIES)
-libfind_process(ARKMATH)
diff --git a/cmake/arkcmake/FindARKOSG.cmake b/cmake/arkcmake/FindARKOSG.cmake
deleted file mode 100644
index 51f641af19ed580ee146e5b6221200ae170b5984..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindARKOSG.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# - Try to find  ARKOSG
-# Once done, this will define
-#
-#  ARKOSG_FOUND - system has scicoslab 
-#  ARKOSG_INCLUDE_DIRS - the scicoslab include directories
-#  ARKOSG_LIBRARIES - libraries to link to
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(ARKOSG)
-
-# Include dir
-find_path(ARKOSG_INCLUDE_DIR
-	NAMES arkosg/osgUtils.hpp
-	PATHS ${COMMON_INCLUDE_PATHS_ARKOSG}
-)
-
-# data dir
-find_path(ARKOSG_DATA_DIR_SEARCH
-	NAMES arkosg/data/models/plane.ac
-	PATHS ${COMMON_DATA_PATHS_ARKOSG}
-)
-set(ARKOSG_DATA_DIR ${ARKOSG_DATA_DIR_SEARCH}/arkosg/data)
-
-# the library itself
-find_library(ARKOSG_LIBRARY
-	NAMES arkosg
-	PATHS ${COMMON_LIBRARY_PATHS_ARKOSG}
-)
-
-# the import file
-find_path(ARKOSG_LIBRARY_DIR
-	NAMES arkosg/arkosg-targets.cmake
-	PATHS ${COMMON_LIBRARY_PATHS_ARKOSG}
-)
-set(ARKOSG_LIB_IMPORT ${ARKOSG_LIBRARY_DIR}/arkosg/arkosg-targets.cmake)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(ARKOSG_PROCESS_INCLUDES ARKOSG_INCLUDE_DIR)
-set(ARKOSG_PROCESS_LIBS ARKOSG_LIBRARY ARKOSG_LIBRARIES)
-libfind_process(ARKOSG)
diff --git a/cmake/arkcmake/FindARKSCICOS.cmake b/cmake/arkcmake/FindARKSCICOS.cmake
deleted file mode 100644
index 31285571129b171768bf11821d26e0b76dcad03b..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindARKSCICOS.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# - Try to find  ARKSCICOS
-# Once done, this will define
-#
-#  ARKSCICOS_FOUND - system has scicoslab 
-#  ARKSCICOS_INCLUDE_DIRS - the scicoslab include directories
-#  ARKSCICOS_LIBRARIES - libraries to link to
-
-include(LibFindMacroos)
-include(MacroCommonPaths)
-
-MacroCommonPaths(ARKSCICOS)
-
-# Include dir
-find_path(ARKSCICOS_INCLUDE_DIR
-	NAMES definiotions.hpp
-	PATHS ${COMMON_INCLUDE_PATHS_ARKSCICOS}
-)
-
-# the library itself
-find_library(ARKSCICOS_LIBRARY
-	NAMES arkscicos
-	PATHS ${COMMON_LIBRARY_PATHS_ARKSCICOS}
-)
-
-# the import file
-find_path(ARKSCICOS_LIBRARY_DIR
-	NAMES arkscicos/arkscicos-targets.cmake
-	PATHS ${COMMON_LIBRARY_PATHS_ARKSCICOS}
-)
-set(ARKSCICOS_LIB_IMPORT ${ARKSCICOS_LIBRARY_DIR}/arkscicos/arkscicos-targets.cmake)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(ARKSCICOS_PROCESS_INCLUDES ARKSCICOS_INCLUDE_DIR)
-set(ARKSCICOS_PROCESS_LIBS ARKSCICOS_LIBRARY ARKSCICOS_LIBRARIES)
-libfind_process(ARKSCICOS)
diff --git a/cmake/arkcmake/FindBOOSTNUMERICBINDINGS.cmake b/cmake/arkcmake/FindBOOSTNUMERICBINDINGS.cmake
deleted file mode 100644
index d2074a54d956370065a16f902c2898b719ab2f05..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindBOOSTNUMERICBINDINGS.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# - Try to find  BOOSTNUMERICBINDINGS
-# Once done, this will define
-#
-#  BOOSTNUMERICBINDINGS_FOUND - system has scicoslab 
-#  BOOSTNUMERICBINDINGS_INCLUDE_DIRS - the scicoslab include directories
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(BOOSTNUMERICBINDINGS)
-
-# Include dir
-find_path(BOOSTNUMERICBINDINGS_INCLUDE_DIR
-	NAMES boost/numeric/bindings/lapack/lapack.h
-	PATHS ${COMMON_INCLUDE_PATHS_BOOSTNUMERICBINDINGS}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(BOOSTNUMERICBINDINGS_PROCESS_INCLUDES BOOSTNUMERICBINDINGS_INCLUDE_DIR)
-libfind_process(BOOSTNUMERICBINDINGS)
diff --git a/cmake/arkcmake/FindEASYSTAR.cmake b/cmake/arkcmake/FindEASYSTAR.cmake
deleted file mode 100644
index 7e3de7d3b43f78f988e8d4f44397a9ba5772570e..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindEASYSTAR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# - Try to find  EASYSTAR
-# Once done, this will define
-#
-#  EASYSTAR_FOUND - system has easystar 
-#  EASYSTAR_INCLUDE_DIRS - the easystar include directories
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(EASYSTAR)
-
-# Include dir
-find_path(EASYSTAR_INCLUDE_DIR
-	NAMES easystar/easystar.xml
-	PATHS ${COMMON_INCLUDE_PATHS_EASYSTAR}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(EASYSTAR_PROCESS_INCLUDES EASYSTAR_INCLUDE_DIR)
-libfind_process(EASYSTAR)
diff --git a/cmake/arkcmake/FindJSBSIM.cmake b/cmake/arkcmake/FindJSBSIM.cmake
deleted file mode 100644
index 56c376946a649908b908f33acfb162684c9bc768..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindJSBSIM.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# - Try to find  JSBSIM
-# Once done, this will define
-#
-#  JSBSIM_FOUND - system has scicoslab 
-#  JSBSIM_INCLUDE_DIRS - the scicoslab include directories
-#  JSBSIM_LIBRARIES - libraries to link to
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(JSBSIM)
-
-# Include dir
-find_path(JSBSIM_INCLUDE_DIR
-	NAMES JSBSim/initialization/FGTrimmer.h
-	PATHS ${COMMON_INCLUDE_PATHS_JSBSIM}
-)
-
-# data dir
-find_path(JSBSIM_DATA_DIR_SEARCH
-	NAMES jsbsim/aircraft/aircraft_template.xml
-	PATHS ${COMMON_DATA_PATHS_JSBSIM}
-)
-set(JSBSIM_DATA_DIR ${JSBSIM_DATA_DIR_SEARCH}/jsbsim)
-
-# Finally the library itself
-find_library(JSBSIM_LIBRARY
-	NAMES JSBSim
-	PATHS ${COMMON_LIBRARY_PATHS_JSBSIM}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(JSBSIM_PROCESS_INCLUDES JSBSIM_INCLUDE_DIR)
-set(JSBSIM_PROCESS_LIBS JSBSIM_LIBRARY JSBSIM_LIBRARIES)
-set(JSBSIM_INCLUDE_DIR ${JSBSIM_INCLUDE_DIR} ${JSBSIM_INCLUDE_DIR}/JSBSim)
-set(JSBSIM_INCLUDES ${JSBSIM_INCLUDES} ${JSBSIM_INCLUDE_DIR}/JSBSim)
-
-libfind_process(JSBSIM)
diff --git a/cmake/arkcmake/FindMAVLINK.cmake b/cmake/arkcmake/FindMAVLINK.cmake
deleted file mode 100644
index 24a949c1308322952b43b058acc9f69be6403326..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindMAVLINK.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# - Try to find  MAVLINK
-# Once done, this will define
-#
-#  MAVLINK_FOUND - system has scicoslab 
-#  MAVLINK_INCLUDE_DIRS - the scicoslab include directories
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(MAVLINK)
-
-# Include dir
-find_path(MAVLINK_INCLUDE_DIR
-	NAMES mavlink/mavlink_types.h
-	PATHS ${COMMON_INCLUDE_PATHS_MAVLINK}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(MAVLINK_PROCESS_INCLUDES MAVLINK_INCLUDE_DIR)
-libfind_process(MAVLINK)
diff --git a/cmake/arkcmake/FindPLIB.cmake b/cmake/arkcmake/FindPLIB.cmake
deleted file mode 100644
index 8e5de7f8f5bc7c2c59174d005af669a3ac1838fc..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindPLIB.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-# Locate plib
-# This module defines
-# PLIB_LIBRARY
-# PLIB_FOUND, if false, do not try to link to plib
-# PLIB_INCLUDE_DIR, where to find the headers
-#
-# $PLIB_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$PLIB_DIR
-#
-# Created David Guthrie with code by Robert Osfield. 
-
-FIND_PATH(PLIB_INCLUDE_DIR plib/js.h
-    $ENV{PLIB_DIR}/include
-    $ENV{PLIB_DIR}
-    $ENV{PLIB_ROOT}/include
-    ${DELTA3D_EXT_DIR}/inc
-    $ENV{DELTA_ROOT}/ext/inc
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;PLIB_ROOT]/include
-    /usr/freeware/include
-)
-
-MACRO(FIND_PLIB_LIBRARY MYLIBRARY MYLIBRARYNAMES)
-
-    FIND_LIBRARY(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAMES}
-        PATHS
-        $ENV{PLIB_DIR}/lib
-        $ENV{PLIB_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{PLIB_ROOT}/lib
-        ${DELTA3D_EXT_DIR}/lib
-        $ENV{DELTA_ROOT}/ext/lib
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;PLIB_ROOT]/lib
-        /usr/freeware/lib64
-    )
-
-ENDMACRO(FIND_PLIB_LIBRARY MYLIBRARY MYLIBRARYNAMES)
-
-SET(PLIB_RELEASE_JS_LIB_NAMES js plibjs)
-SET(PLIB_RELEASE_UL_LIB_NAMES ul plibul)
-SET(PLIB_DEBUG_JS_LIB_NAMES js_d plibjs_d)
-SET(PLIB_DEBUG_UL_LIB_NAMES ul_d plibul_d)
-
-
-FIND_PLIB_LIBRARY(PLIB_JS_LIBRARY "${PLIB_RELEASE_JS_LIB_NAMES}")
-FIND_PLIB_LIBRARY(PLIB_JS_LIBRARY_DEBUG "${PLIB_DEBUG_JS_LIB_NAMES}")
-FIND_PLIB_LIBRARY(PLIB_UL_LIBRARY "${PLIB_RELEASE_UL_LIB_NAMES}")
-FIND_PLIB_LIBRARY(PLIB_UL_LIBRARY_DEBUG "${PLIB_DEBUG_UL_LIB_NAMES}")
-
-SET(PLIB_FOUND "NO")
-IF(PLIB_JS_LIBRARY AND PLIB_INCLUDE_DIR)
-    SET(PLIB_FOUND "YES")
-ENDIF(PLIB_JS_LIBRARY AND PLIB_INCLUDE_DIR)
diff --git a/cmake/arkcmake/FindSCICOSLAB.cmake b/cmake/arkcmake/FindSCICOSLAB.cmake
deleted file mode 100644
index 1ba3a3e4a812d6d332ce322fa603579bcef5e7c1..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindSCICOSLAB.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-# - Try to find  SCICOSLAB
-# Once done, this will define
-#
-#  SCICOSLAB_FOUND - system has scicoslab 
-#  SCICOSLAB_INCLUDE_DIRS - the scicoslab include directories
-#  SCICOSLAB_CONTRIB_DIR - the scicoslab contrib directory
-
-include(LibFindMacros)
-
-# find scicos
-if (APPLE)
-    execute_process(COMMAND mdfind "kMDItemKind == Application && kMDItemDisplayName == ScicosLabGtk"
-        COMMAND head -1
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE SCICOS_APP_BUNDLE
-        ERROR_VARIABLE ERROR_MESSAGE
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (RESULT) 
-        MESSAGE(FATAL_ERROR "Could not locate 'ScicosLabGtk.app' - ${ERROR_MESSAGE}")
-    endif (RESULT)
-    execute_process(COMMAND find ${SCICOS_APP_BUNDLE} -name routines
-        COMMAND head -1
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE SCICOSLAB_GUESS_INCLUDE_DIRS
-        ERROR_VARIABLE ERROR_MESSAGE
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (RESULT) 
-        MESSAGE(FATAL_ERROR "Could not locate 'scicos_block4.h' in ScicosLabGtk.app - ${ERROR_MESSAGE}")
-    endif (RESULT)  
-    execute_process(COMMAND find ${SCICOS_APP_BUNDLE} -name contrib 
-        COMMAND head -1
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE SCICOSLAB_GUESS_CONTRIB_DIRS
-        ERROR_VARIABLE ERROR_MESSAGE
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (RESULT) 
-        MESSAGE(FATAL_ERROR "Could not locate 'loader.sce' in ScicosLabGtk.app - ${ERROR_MESSAGE}")
-    endif (RESULT)  
-elseif(UNIX)
-    set(SCICOSLAB_GUESS_INCLUDE_DIRS
-        /usr/lib/scicoslab-gtk-4.4b7/routines
-        /usr/lib/scicoslab-gtk-4.4/routines
-        /usr/lib/scicoslab-gtk-4.4.1/routines
-        )
-	set(SCICOSLAB_GUESS_CONTRIB_DIRS
-		/usr/lib/scicoslab-gtk-4.4b7/contrib
-		/usr/lib/scicoslab-gtk-4.4/contrib
-		/usr/lib/scicoslab-gtk-4.4.1/contrib
-	)
-elseif(WIN32)
-    message(FATAL_ERROR "scicoslab cmake find module doesn't work for windows")
-endif()
-
-
-# Include dir
-find_path(SCICOSLAB_INCLUDE_DIR
-  NAMES scicos/scicos_block4.h
-  PATHS ${SCICOSLAB_GUESS_INCLUDE_DIRS}
-)
-
-# Contrib dir
-find_path(SCICOSLAB_CONTRIB_DIR
-  NAMES loader.sce
-  PATHS ${SCICOSLAB_GUESS_CONTRIB_DIRS}
-)
-message(STATUS "contrib dir ${SCICOSLAB_CONTRIB_DIR}")
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(SCICOSLAB_PROCESS_INCLUDES SCICOSLAB_INCLUDE_DIR)
-libfind_process(SCICOSLAB)
-# vim:ts=4:sw=4:expandtab
diff --git a/cmake/arkcmake/FindSIMGEAR.cmake b/cmake/arkcmake/FindSIMGEAR.cmake
deleted file mode 100644
index e86de2aa9378ddac4c7df4f57b4d43942a403f84..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/FindSIMGEAR.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# - Try to find  SIMGEAR
-# Once done, this will define
-#
-#  SIMGEAR_FOUND - system has scicoslab 
-#  SIMGEAR_INCLUDE_DIRS - the scicoslab include directories
-#  SIMGEAR_LIBRARIES - libraries to link to
-
-include(LibFindMacros)
-include(MacroCommonPaths)
-
-MacroCommonPaths(SIMGEAR)
-
-# Include dir
-find_path(SIMGEAR_INCLUDE_DIR
-	NAMES simgear/version.h
-	PATHS  ${COMMON_INCLUDE_PATHS_SIMGEAR}
-)
-
-# Finally the library itself
-find_library(SIMGEAR_LIBRARY
-	NAMES sgio
-	PATHS  ${COMMON_LIBRARY_PATHS_SIMGEAR}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(SIMGEAR_PROCESS_INCLUDES SIMGEAR_INCLUDE_DIR)
-set(SIMGEAR_PROCESS_LIBS SIMGEAR_LIBRARY SIMGEAR_LIBRARIES)
-libfind_process(SIMGEAR)
diff --git a/cmake/arkcmake/LibFindMacros.cmake b/cmake/arkcmake/LibFindMacros.cmake
deleted file mode 100644
index ff9233a6c821be3f8dedf63632d1284951df5d7c..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/LibFindMacros.cmake
+++ /dev/null
@@ -1,98 +0,0 @@
-# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
-# used for the current package. For this to work, the first parameter must be the
-# prefix of the current package, then the prefix of the new package etc, which are
-# passed to find_package.
-macro (libfind_package PREFIX)
-  set (LIBFIND_PACKAGE_ARGS ${ARGN})
-  if (${PREFIX}_FIND_QUIETLY)
-    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
-  endif (${PREFIX}_FIND_QUIETLY)
-  if (${PREFIX}_FIND_REQUIRED)
-    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
-  endif (${PREFIX}_FIND_REQUIRED)
-  find_package(${LIBFIND_PACKAGE_ARGS})
-endmacro (libfind_package)
-
-# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
-# where they added pkg_check_modules. Consequently I need to support both in my scripts
-# to avoid those deprecated warnings. Here's a helper that does just that.
-# Works identically to pkg_check_modules, except that no checks are needed prior to use.
-macro (libfind_pkg_check_modules PREFIX PKGNAME)
-  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    include(UsePkgConfig)
-    pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
-  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    find_package(PkgConfig)
-    if (PKG_CONFIG_FOUND)
-      pkg_check_modules(${PREFIX} ${PKGNAME})
-    endif (PKG_CONFIG_FOUND)
-  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-endmacro (libfind_pkg_check_modules)
-
-# Do the final processing once the paths have been detected.
-# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
-# all the variables, each of which contain one include directory.
-# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
-# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
-# Also handles errors in case library detection was required, etc.
-macro (libfind_process PREFIX)
-  # Skip processing if already processed during this run
-  if (NOT ${PREFIX}_FOUND)
-    # Start with the assumption that the library was found
-    set (${PREFIX}_FOUND TRUE)
-
-    # Process all includes and set _FOUND to false if any are missing
-    foreach (i ${${PREFIX}_PROCESS_INCLUDES})
-      if (${i})
-        set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
-        mark_as_advanced(${i})
-      else (${i})
-        set (${PREFIX}_FOUND FALSE)
-      endif (${i})
-    endforeach (i)
-
-    # Process all libraries and set _FOUND to false if any are missing
-    foreach (i ${${PREFIX}_PROCESS_LIBS})
-      if (${i})
-        set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
-        mark_as_advanced(${i})
-      else (${i})
-        set (${PREFIX}_FOUND FALSE)
-      endif (${i})
-    endforeach (i)
-
-    # Print message and/or exit on fatal error
-    if (${PREFIX}_FOUND)
-      if (NOT ${PREFIX}_FIND_QUIETLY)
-        message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
-      endif (NOT ${PREFIX}_FIND_QUIETLY)
-    else (${PREFIX}_FOUND)
-      if (${PREFIX}_FIND_REQUIRED)
-        foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
-          message("${i}=${${i}}")
-        endforeach (i)
-        message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
-      endif (${PREFIX}_FIND_REQUIRED)
-    endif (${PREFIX}_FOUND)
-  endif (NOT ${PREFIX}_FOUND)
-endmacro (libfind_process)
-
-macro(libfind_library PREFIX basename)
-  set(TMP "")
-  if(MSVC80)
-    set(TMP -vc80)
-  endif(MSVC80)
-  if(MSVC90)
-    set(TMP -vc90)
-  endif(MSVC90)
-  set(${PREFIX}_LIBNAMES ${basename}${TMP})
-  if(${ARGC} GREATER 2)
-    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
-    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
-    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
-  endif(${ARGC} GREATER 2)
-  find_library(${PREFIX}_LIBRARY
-    NAMES ${${PREFIX}_LIBNAMES}
-    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
-  )
-endmacro(libfind_library)
diff --git a/cmake/arkcmake/MacroAddCompileFlags.cmake b/cmake/arkcmake/MacroAddCompileFlags.cmake
deleted file mode 100644
index a866689da655f90435a7644964e7efee32bae7a7..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroAddCompileFlags.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# - MACRO_ADD_COMPILE_FLAGS(target_name flag1 ... flagN)
-
-# Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
-# Copyright (c) 2006, Andreas Schneider, <mail@cynapses.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-macro (MACRO_ADD_COMPILE_FLAGS _target)
-
-  get_target_property(_flags ${_target} COMPILE_FLAGS)
-  if (_flags)
-    set(_flags ${_flags} ${ARGN})
-  else (_flags)
-    set(_flags ${ARGN})
-  endif (_flags)
-
-  set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags})
-
-endmacro (MACRO_ADD_COMPILE_FLAGS)
diff --git a/cmake/arkcmake/MacroAddLinkFlags.cmake b/cmake/arkcmake/MacroAddLinkFlags.cmake
deleted file mode 100644
index 91cad3062545ed9e0c8029d5a0dd3395e03fd31f..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroAddLinkFlags.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# - MACRO_ADD_LINK_FLAGS(target_name flag1 ... flagN)
-
-# Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
-# Copyright (c) 2006, Andreas Schneider, <mail@cynapses.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro (MACRO_ADD_LINK_FLAGS _target)
-
-  get_target_property(_flags ${_target} LINK_FLAGS)
-  if (_flags)
-    set(_flags "${_flags} ${ARGN}")
-  else (_flags)
-    set(_flags "${ARGN}")
-  endif (_flags)
-
-  set_target_properties(${_target} PROPERTIES LINK_FLAGS "${_flags}")
-
-endmacro (MACRO_ADD_LINK_FLAGS)
diff --git a/cmake/arkcmake/MacroAddPlugin.cmake b/cmake/arkcmake/MacroAddPlugin.cmake
deleted file mode 100644
index 36b5e57e01bcb6487d6da2309914f1d246eaa108..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroAddPlugin.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#  - MACRO_ADD_PLUGIN(name [WITH_PREFIX] file1 .. fileN)
-#
-#  Create a plugin from the given source files.
-#  If WITH_PREFIX is given, the resulting plugin will have the
-#  prefix "lib", otherwise it won't.
-#
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-# Copyright (c) 2006, Andreas Schneider, <mail@cynapses.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-macro (MACRO_ADD_PLUGIN _target_NAME _with_PREFIX)
-
-  if (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-    set(_first_SRC)
-  else (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-    set(_first_SRC ${_with_PREFIX})
-  endif (${_with_PREFIX} STREQUAL "WITH_PREFIX")
-
-  add_library(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
-
-  if (_first_SRC)
-    set_target_properties(${_target_NAME} PROPERTIES PREFIX "")
-  endif (_first_SRC)
-
-endmacro (MACRO_ADD_PLUGIN _name _sources)
-
diff --git a/cmake/arkcmake/MacroCheckCCompilerFlagSSP.cmake b/cmake/arkcmake/MacroCheckCCompilerFlagSSP.cmake
deleted file mode 100644
index b64fb453a4daccecc26fde9cd22e9ba89272a74c..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroCheckCCompilerFlagSSP.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# - Check whether the C compiler supports a given flag in the
-# context of a stack checking compiler option.
-# CHECK_C_COMPILER_FLAG_SSP(FLAG VARIABLE)
-#
-#  FLAG - the compiler flag
-#  VARIABLE - variable to store the result
-# 
-#  This actually calls the check_c_source_compiles macro.
-#  See help for CheckCSourceCompiles for a listing of variables
-#  that can modify the build.
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-INCLUDE(CheckCSourceCompiles)
-
-MACRO (CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT)
-   SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-   SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
-   CHECK_C_SOURCE_COMPILES("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT})
-   SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-ENDMACRO (CHECK_C_COMPILER_FLAG_SSP)
-
diff --git a/cmake/arkcmake/MacroCommonPaths.cmake b/cmake/arkcmake/MacroCommonPaths.cmake
deleted file mode 100644
index 03f1d89867dbe5274eb1f20564b3d613ee0e262c..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroCommonPaths.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-macro(MacroCommonPaths NAME)
-    set(COMMON_INCLUDE_PATHS_${NAME}
-        $ENV{${NAME}_DIR}/include
-        $ENV{${NAME}_DIR}
-        $ENV{${NAME}_ROOT}/include
-        $ENV{${NAME}_ROOT}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/include
-        /usr/include
-        /sw/include # Fink
-        /opt/local/include # DarwinPorts
-        /opt/csw/include # Blastwave
-        /opt/include
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\\Manager\\Environment;${NAME}_DIR]/include
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\\Manager\\Environment;${NAME}_ROOT]/include
-        /usr/freeware/include
-        )
-    set(COMMON_LIB_PATHS_${NAME}
-        $ENV{${NAME}_DIR}/lib
-        $ENV{${NAME}_DIR}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\\Manager\\Environment;${NAME}_DIR]/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\\Manager\\Environment;${NAME}_ROOT]/lib
-        /usr/freeware/lib64
-        )
-    set(COMMON_DATA_PATHS_${NAME}
-        $ENV{${NAME}_DIR}/share
-        $ENV{${NAME}_DIR}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/share
-        /usr/share
-        /sw/share
-        /opt/local/share
-        /opt/csw/share
-        /opt/share
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\\Manager\\Environment;${NAME}_DIR]/share
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\\Manager\\Environment;${NAME}_ROOT]/share
-        /usr/freeware/share64
-        )
-endmacro(MacroCommonPaths)
-
-# vim:ts=4:sw=4:expandtab
diff --git a/cmake/arkcmake/MacroCopyFile.cmake b/cmake/arkcmake/MacroCopyFile.cmake
deleted file mode 100644
index cee1cae37e815c1b3b5c35e1b757e46f733bee02..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroCopyFile.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# - macro_copy_file(_src _dst)
-# Copies a file to ${_dst} only if ${_src} is different (newer) than ${_dst}
-#
-# Example:
-# macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/icon.png ${CMAKE_CURRENT_BINARY_DIR}/.)
-# Copies file icon.png to ${CMAKE_CURRENT_BINARY_DIR} directory
-#
-# Copyright (c) 2006-2007  Wengo
-# Copyright (c) 2006-2008  Andreas Schneider <mail@cynapses.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING file.
-
-
-macro (macro_copy_file _src _dst)
-  # Removes all path containing .svn or CVS or CMakeLists.txt during the copy
-  if (NOT ${_src} MATCHES ".*\\.svn|CVS|CMakeLists\\.txt.*")
-
-    if (CMAKE_VERBOSE_MAKEFILE)
-      message(STATUS "Copy file from ${_src} to ${_dst}")
-    endif (CMAKE_VERBOSE_MAKEFILE)
-
-    # Creates directory if necessary
-    get_filename_component(_path ${_dst} PATH)
-    file(MAKE_DIRECTORY ${_path})
-
-    execute_process(
-      COMMAND
-        ${CMAKE_COMMAND} -E copy_if_different ${_src} ${_dst}
-      OUTPUT_QUIET
-    )
-  endif (NOT ${_src} MATCHES ".*\\.svn|CVS|CMakeLists\\.txt.*")
-endmacro (macro_copy_file)
diff --git a/cmake/arkcmake/MacroEnsureOutOfSourceBuild.cmake b/cmake/arkcmake/MacroEnsureOutOfSourceBuild.cmake
deleted file mode 100644
index 3ff891b5127f0867b97e9d6c8844d2eaa2b761c4..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroEnsureOutOfSourceBuild.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# - MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
-# MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage)
-
-    string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" _insource)
-    if (_insource)
-        file(REMOVE [CMakeCache.txt CMakeFiles]) 
-        message(FATAL_ERROR "${_errorMessage}")
-    endif (_insource)
-
-endmacro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD)
-
-# vim:ts=4:sw=4:expandtab
diff --git a/cmake/arkcmake/MacroFindOrBuild.cmake b/cmake/arkcmake/MacroFindOrBuild.cmake
deleted file mode 100644
index 973472d7c8598e7e741775dd891af51658d3a598..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroFindOrBuild.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-macro(MacroFindOrBuild PACKAGE PACKAGE_PATH IS_GIT_SUBMODULE)
-	add_custom_target(${PACKAGE})
-	if (NOT ${PACKAGE}_BUILD_FROM_SOURCE)
-		find_package(${PACKAGE})
-	endif()
-	if (NOT ${PACKAGE}_FOUND)
-		set(${PACKAGE}_BUILD_FROM_SOURCE TRUE)
-		message(STATUS "could not find package ${PACKAGE}, building from source")
-		add_custom_target(${PACKAGE}_BUILD DEPENDS ${PACKAGE}_BUILD.stamp)
-		add_dependencies(${PACKAGE} ${PACKAGE}_BUILD)
-		set(${PACKAGE}_FOUND TRUE)
-		if (${IS_GIT_SUBMODULE})
-			message(STATUS "${PACKAGE} detected as git submodule, will attempt to initialize it")
-			list(APPEND GIT_SUBMODULES ${PACKAGE_PATH})
-			add_dependencies(${PACKAGE}_BUILD GIT)
-		endif()
-	endif()
-endmacro(MacroFindOrBuild)
diff --git a/cmake/arkcmake/MacroSetDefault.cmake b/cmake/arkcmake/MacroSetDefault.cmake
deleted file mode 100644
index acb1e66698d721d8f622cffd2fccd3a7804f9540..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/MacroSetDefault.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-macro(MacroSetDefault VAR DEFAULT)
-	if (NOT DEFINED ${VAR})
-		set(${VAR} ${DEFAULT})
-	endif()
-endmacro(MacroSetDefault)
-
diff --git a/cmake/arkcmake/README.md b/cmake/arkcmake/README.md
deleted file mode 100644
index 5eaeb70b42eea68f89b40cc18fe630814329c749..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-arktools cmake modules
-=============
-
-This repository contains the cmake modules used by arktools. 
-The python scripts do not function unless they are in an arktool. 
-From an arktool (ex. arktools/arkscicos) run:
-
-```console
-./cmake/updateArkcmake.py
-```
diff --git a/cmake/arkcmake/UseDoxygen.cmake b/cmake/arkcmake/UseDoxygen.cmake
deleted file mode 100644
index c4ab7cccf34cc10a946cafe848db1fa99b027d7f..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/UseDoxygen.cmake
+++ /dev/null
@@ -1,100 +0,0 @@
-# - Run Doxygen
-#
-# Adds a doxygen target that runs doxygen to generate the html
-# and optionally the LaTeX API documentation.
-# The doxygen target is added to the doc target as dependency.
-# i.e.: the API documentation is built with:
-#  make doc
-#
-# USAGE: INCLUDE IN PROJECT
-#
-#  set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-#  include(UseDoxygen)
-# Add the Doxyfile.in and UseDoxygen.cmake files to the projects source directory.
-#
-#
-# Variables you may define are:
-#  DOXYFILE_OUTPUT_DIR - Path where the Doxygen output is stored. Defaults to "doc".
-#
-#  DOXYFILE_LATEX_DIR - Directory where the Doxygen LaTeX output is stored. Defaults to "latex".
-#
-#  DOXYFILE_HTML_DIR - Directory where the Doxygen html output is stored. Defaults to "html".
-#
-
-#
-#  Copyright (c) 2009-2010 Tobias Rautenkranz <tobias@rautenkranz.ch>
-#  Copyright (c) 2010      Andreas Schneider <mail@cynapses.org>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-macro(usedoxygen_set_default name value)
-    if(NOT DEFINED "${name}")
-        set("${name}" "${value}")
-    endif()
-endmacro()
-
-find_package(Doxygen)
-
-if(DOXYGEN_FOUND)
-    find_file(DOXYFILE_IN
-        NAMES
-            doxy.config.in
-        PATHS
-            ${CMAKE_CURRENT_SOURCE_DIR}
-            ${CMAKE_ROOT}/Modules/
-        NO_DEFAULT_PATH)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(DOXYFILE_IN DEFAULT_MSG "DOXYFILE_IN")
-endif()
-
-if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
-    add_custom_target(doxygen ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config)
-
-    usedoxygen_set_default(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-    usedoxygen_set_default(DOXYFILE_HTML_DIR "html")
-
-    set_property(DIRECTORY APPEND PROPERTY
-            ADDITIONAL_MAKE_CLEAN_FILES "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_HTML_DIR}")
-
-    set(DOXYFILE_LATEX FALSE)
-    set(DOXYFILE_PDFLATEX FALSE)
-    set(DOXYFILE_DOT FALSE)
-
-    find_package(LATEX)
-    if(LATEX_COMPILER AND MAKEINDEX_COMPILER)
-        set(DOXYFILE_LATEX TRUE)
-        usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex")
-
-        set_property(DIRECTORY APPEND PROPERTY
-                ADDITIONAL_MAKE_CLEAN_FILES
-                "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
-
-        if(PDFLATEX_COMPILER)
-            set(DOXYFILE_PDFLATEX TRUE)
-        endif()
-        if(DOXYGEN_DOT_EXECUTABLE)
-            set(DOXYFILE_DOT TRUE)
-        endif()
-
-        add_custom_command(TARGET doxygen
-            POST_BUILD
-            COMMAND ${CMAKE_MAKE_PROGRAM}
-            WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
-    endif()
-
-    configure_file(${DOXYFILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config ESCAPE_QUOTES IMMEDIATE @ONLY)
-    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in ${CMAKE_CURRENT_BINARY_DIR}/doxy.trac ESCAPE_QUOTES IMMEDIATE @ONLY)
-        add_custom_target(doxygen-trac ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.trac)
-    endif()
-
-    get_target_property(DOC_TARGET doc TYPE)
-    if(NOT DOC_TARGET)
-        add_custom_target(doc)
-    endif()
-
-    add_dependencies(doc doxygen)
-endif()
diff --git a/cmake/arkcmake/autobuild.py b/cmake/arkcmake/autobuild.py
deleted file mode 100755
index c5eed1e22d3fd6fc7626baedb11d5b171daecfa4..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/autobuild.py
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/python 
-# Author: Lenna X. Peterson (github.com/lennax)
-# based on bash script by James Goppert (github.com/jgoppert)
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# USAGE:                                                                      #
-# $ ./autobuild.py [1-9]                                                      #
-#   Then follow menu                                                          #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-# TODO: Error handling: 
-## check cmake success, etc.
-## catch CMake Warning:
-  #Manually-specified variables were not used by the project:
-		  #BUILD_TYPE
-#     (missing gprof flags)
-
-import sys # for sys.argv[] and sys.platform
-import os # for chdir()
-import subprocess # for check_call()
-import shutil # for rmtree()
-from optparse import OptionParser # for parsing options
-try: 
-	from get_build_path import get_build_path
-except ImportError: 
-	print "Could not find 'get_build_path.py' "
-	print "in '%s'" % os.path.dirname(os.path.abspath(__file__))
-	print "This module is required."
-	raise SystemExit
-
-## Move to directory containing CMakeLists.txt and src/
-build_path = get_build_path()
-if build_path:
-	os.chdir(build_path)
-else: 
-	print "The script was unable to find a build directory."
-	raise SystemExit
-
-makeargs = "-j8"
-cmakecall = ["cmake", ".."]
-build_dir = "build"
-
-## Parse command line options
-## TODO: add makeargs/cmakeargs etc.
-## (with 'action="append"' to append arg(s) to list)
-usage = "usage: %prog [options] [1-9]"
-parser = OptionParser(usage=usage)
-parser.set_defaults(verbose=False, makeargs="-j8")
-parser.add_option("-v", "--verbose",
-				action="store_true", dest="verbose",
-				help="Verbose mode")
-parser.add_option("-c", "--cmake",
-				action="store", dest="cm",
-				help="Specify one or more arguments for CMake")
-#parser.add_option("--makeargs", 
-#                  action="store", type="string", dest="makeargs",
-#                  help="Argument to `make` [default '-j8']")
-(options, args) = parser.parse_args()
-if options.verbose:
-    os.environ['VERBOSE'] = "1"
-### Split cmakeargs, reassemble, and insert into cmake call
-if options.cm:
-	cm_raw = options.cm
-	cm_list = cm_raw.split("-D")
-	if cm_list[0] == "":
-		cm_list.pop(0)
-	for cm in cm_list:
-		cm = cm.lstrip()
-		cmakearg = "-D" + cm
-		cmakecall.insert(1, cmakearg)
-#if options.makeargs:
-#    makeargs = options.makeargs
-
-
-def install_build(cmakecall, exitVal=True):
-    if not os.path.isdir(build_dir): 
-        os.mkdir(build_dir)
-    os.chdir(build_dir)
-    subprocess.check_call(cmakecall)
-    subprocess.check_call(["make", makeargs])
-    if exitVal == True:
-        raise SystemExit
-	
-def dev_build():
-	cmakecall.insert(1, "-DDEV_MODE::bool=TRUE")
-	install_build(cmakecall)
-
-def grab_deps():
-	if 'linux' in sys.platform:
-		try: 
-			subprocess.check_call('sudo apt-get install cmake', shell=True)
-		except: 
-			print "Error installing dependencies: ", sys.exc_info()[0]
-			print "apt-get is available on Debian and Ubuntu" 
-			raise SystemExit
-	elif 'darwin' in sys.platform:
-		try: 
-			subprocess.check_call('sudo port install cmake', shell=True)
-		except: 
-			print "Error installing dependencies: ", sys.exc_info()[0]
-			print "Please install Macports (http://www.macports.org)"
-			raise SystemExit
-	else: 
-		print "Platform not recognized (did not match linux or darwin)"
-		print "Script doesn't download dependencies for this platform"
-        raise SystemExit
-
-def package_source():
-    install_build(cmakecall, exitVal=False)
-    subprocess.check_call(["make", "package_source"])
-    raise SystemExit
-
-def package():
-    install_build(cmakecall, exitVal=False)
-    subprocess.check_call(["make", "package"])
-    raise SystemExit
-
-def remake():
-    if not os.path.isdir(build_dir): 
-        print "Directory '%s' does not exist" % build_dir
-        print "You must make before you can remake."
-        return 1
-    os.chdir(build_dir)
-    subprocess.check_call(["make", makeargs])
-    raise SystemExit
-
-def clean():
-	if 'posix' in os.name: 
-		print "Cleaning '%s' with rm -rf" % build_dir
-		subprocess.check_call(["rm", "-rf", build_dir])
-	else: 
-		print "Cleaning '%s' with shutil.rmtree()" % build_dir
-		print "(may be very slow)"
-		shutil.rmtree(build_dir, ignore_errors=True)
-	print "Build cleaned"
-
-# requires PROFILE definition in CMakeLists.txt:
-# set(CMAKE_BUILD_TYPE PROFILE)
-# set(CMAKE_CXX_FLAGS_PROFILE "-g -pg")
-# set(CMAKE_C_FLAGS_PROFILE "-g -pg")
-def profile():
-	cmakecall.insert(1, "-DDEV_MODE::bool=TRUE")
-	cmakecall.insert(2, "-DBUILD_TYPE=PROFILE")
-	install_build(cmakecall)
-	
-def menu():
-	print "1. developer build: used for development."
-	print "2. install build: used for building before final installation to the system."
-	print "3. grab dependencies: installs all the required packages for debian based systems (ubuntu maverick/ debian squeeze,lenny) or darwin with macports."
-	print "4. package source: creates a source package for distribution."
-	print "5. package: creates binary packages for distribution."
-	print "6. remake: calls make again after project has been configured as install or in source build."
-	print "7. clean: removes the build directory."
-	print "8. profile: compiles for gprof."
-	print "9. end."
-	opt = raw_input("Please choose an option: ")
-	return opt
-
-try: 
-    loop_num = 0
-    # continues until a function raises system exit or ^C
-    while (1): 	
-        if len(args) == 1 and loop_num == 0:
-            opt = args[0]
-            loop_num += 1
-        else:
-            opt = menu()
-
-        try:
-            opt = int(opt)
-        except ValueError:
-            pass
-            
-        if   opt == 1:
-            print "You chose developer build"
-            dev_build()
-        elif opt == 2:
-            print "You chose install build"
-            install_build(cmakecall)
-        elif opt == 3: 
-            print "You chose to install dependencies"
-            grab_deps()
-        elif opt == 4:
-            print "You chose to package the source"
-            package_source()
-        elif opt == 5:
-            print "You chose to package the binary"
-            package()
-        elif opt == 6:
-            print "You chose to re-call make on the previously configured build"
-            remake()
-        elif opt == 7:
-            print "You chose to clean the build"
-            clean()
-        elif opt == 8:
-            # requires definition in CMakeLists.txt (see def above)
-            print "You chose to compile for gprof"
-            profile()
-        elif opt == 9:
-            raise SystemExit
-        else:
-            print "Invalid option. Please try again: " 
-		
-except KeyboardInterrupt: 
-	print "\n" 
diff --git a/cmake/arkcmake/get_build_path.py b/cmake/arkcmake/get_build_path.py
deleted file mode 100755
index c313476a9f2998ba04081741d2474a309e928e50..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/get_build_path.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/python
-# Author: Lenna X. Peterson (github.com/lennax)
-# Determines appropriate path for CMake
-#  Looks for "CMakeLists.txt" and "src/"
-#   ( BUILDFILE and SRCDIR in find_build_dir() )
-#  Searches the following paths:
-#   1 Path of call
-#   2 Path where script is located
-#   3 Path above 2 (parent directory)
-#   4 Path above 3 (grandparent directory)
-
-import os # for getcwd(), os.path
-
-def get_build_path():
-
-	build_dir=""
-
-	## Initialize search paths
-	call_dir = os.getcwd()
-	script_dir = os.path.dirname(os.path.abspath(__file__))
-	script_mom = os.path.abspath(script_dir + os.sep + os.pardir)
-	script_grandma = os.path.abspath(script_mom + os.sep + os.pardir)
-	if script_mom == call_dir:
-		script_mom = ""
-	if script_grandma == call_dir:
-		script_grandma = ""
-
-	## Define function to search for required components for build
-	def find_build_dir(search_dir):
-		BUILDFILE = "CMakeLists.txt"
-		#SRCDIR = "src"
-		os.chdir(search_dir)
-		if os.path.isfile(BUILDFILE):
-			return search_dir
-		return False
-
-	## Class to emulate if temp = x 
-	#      (checking equality of x while assigning it to temp)
-	#      Borrowed from Alex Martelli
-	class Holder(object):
-		def set(self, value):
-			self.value = value
-			return value
-		def get(self):
-			return self.value
-
-	temp = Holder()
-
-	## Search paths for build components
-	if temp.set(find_build_dir(call_dir)): 
-		build_dir = temp.get()
-	elif temp.set(find_build_dir(script_dir)): 
-		build_dir = temp.get()
-	elif script_mom and temp.set(find_build_dir(script_mom)): 
-		build_dir = temp.get()
-	elif script_grandma and temp.set(find_build_dir(script_grandma)):
-		build_dir = temp.get()
-	else: 
-		return 0
-	
-	print "I go now. Good luck, everybody!"
-	return build_dir
diff --git a/cmake/arkcmake/language_support_v2.cmake b/cmake/arkcmake/language_support_v2.cmake
deleted file mode 100644
index aa5870bb093a05efe13a7a042a44adcb2428debe..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/language_support_v2.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# cmake/modules/language_support.cmake
-#
-# Temporary additional general language support is contained within this
-# file.  
-
-# This additional function definition is needed to provide a workaround for
-# CMake bug 9220.
-
-# On debian testing (cmake 2.6.2), I get return code zero when calling 
-# cmake the first time, but cmake crashes when running a second time
-# as follows:
-#
-#  -- The Fortran compiler identification is unknown
-#  CMake Error at /usr/share/cmake-2.6/Modules/CMakeFortranInformation.cmake:7 (GET_FILENAME_COMPONENT):
-#    get_filename_component called with incorrect number of arguments
-#  Call Stack (most recent call first):
-#    CMakeLists.txt:3 (enable_language)
-#
-# My workaround is to invoke cmake twice.  If both return codes are zero, 
-# it is safe to invoke ENABLE_LANGUAGE(Fortran OPTIONAL)
-
-function(workaround_9220 language language_works)
-  #message("DEBUG: language = ${language}")
-  set(text
-    "project(test NONE)
-cmake_minimum_required(VERSION 2.6.0)
-enable_language(${language} OPTIONAL)
-"
-    )
-  file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/language_tests/${language})
-  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language})
-  file(WRITE ${CMAKE_BINARY_DIR}/language_tests/${language}/CMakeLists.txt
-    ${text})
-  execute_process(
-    COMMAND ${CMAKE_COMMAND} .
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language}
-    RESULT_VARIABLE return_code
-    OUTPUT_QUIET
-    ERROR_QUIET
-    )
-
-  if(return_code EQUAL 0)
-    # Second run
-    execute_process (
-      COMMAND ${CMAKE_COMMAND} .
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language}
-      RESULT_VARIABLE return_code
-      OUTPUT_QUIET
-      ERROR_QUIET
-      )
-    if(return_code EQUAL 0)
-      set(${language_works} ON PARENT_SCOPE)
-    else(return_code EQUAL 0)
-      set(${language_works} OFF PARENT_SCOPE)
-    endif(return_code EQUAL 0)
-  else(return_code EQUAL 0)
-    set(${language_works} OFF PARENT_SCOPE)
-  endif(return_code EQUAL 0)
-endfunction(workaround_9220)
-
-# Temporary tests of the above function.
-#workaround_9220(CXX CXX_language_works)
-#message("CXX_language_works = ${CXX_language_works}")
-#workaround_9220(CXXp CXXp_language_works)
-#message("CXXp_language_works = ${CXXp_language_works}")
diff --git a/cmake/arkcmake/updateArkcmake.py b/cmake/arkcmake/updateArkcmake.py
deleted file mode 100755
index df75104ac9486201719f3eacf2995d9f4973e59a..0000000000000000000000000000000000000000
--- a/cmake/arkcmake/updateArkcmake.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/python
-# Author: Lenna X. Peterson (github.com/lennax)
-# Based on bash script by James Goppert (github.com/jgoppert)
-#
-# script used to update cmake modules from git repo, can't make this
-# a submodule otherwise it won't know how to interpret the CMakeLists.txt
-# # # # # # subprocess# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-import os # for os.path
-import subprocess # for check_call()
-
-clone_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-print clone_path
-os.chdir(clone_path)
-subprocess.check_call(["git", "clone", "git://github.com/arktools/arkcmake.git","arkcmake_tmp"])
-subprocess.check_call(["rm", "-rf", "arkcmake_tmp/.git"])
-if os.path.isdir("arkcmake"):
-	subprocess.check_call(["rm", "-rf", "arkcmake"])
-subprocess.check_call(["mv", "arkcmake_tmp", "arkcmake"])
diff --git a/cmake/modules/ApmMakeLib.cmake b/cmake/modules/ApmMakeLib.cmake
deleted file mode 100644
index 4077c0f7f33d98927f4aeb0ccb7c5467fa79f6e2..0000000000000000000000000000000000000000
--- a/cmake/modules/ApmMakeLib.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-string(REGEX REPLACE ".*/" "" LIB_NAME ${CMAKE_CURRENT_SOURCE_DIR})
-#message(STATUS "building lib: ${LIB_NAME}")
-file(GLOB ${LIB_NAME}_SRCS *.cpp)
-file(GLOB ${LIB_NAME}_HDRS *.h)
-set(${LIB_NAME}_BOARD ${BOARD})
-generate_arduino_library(${LIB_NAME})
-set_target_properties(${LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/cmake/modules/ApmMakeSketch.cmake b/cmake/modules/ApmMakeSketch.cmake
deleted file mode 100644
index 6aabc20ff2bebc2d7798cead659b2acb96ebc387..0000000000000000000000000000000000000000
--- a/cmake/modules/ApmMakeSketch.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-string(REGEX REPLACE ".*/" "" PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR})
-project(${PROJECT_NAME} C CXX)
-
-set (CMAKE_CXX_SOURCE_FILE_EXTENSIONS pde)
-
-find_package(Arduino 22 REQUIRED)
-
-if (NOT DEFINED BOARD)
-	message(STATUS "board not defined, assuming mega, use cmake -DBOARD=mega2560 , etc. to specify")
-	set(BOARD "mega")
-endif()
-message(STATUS "Board configured as: ${BOARD}")
-
-# need to configure based on host operating system
-set(${PROJECT_NAME}_PORT COM2)
-set(${PROJECT_NAME}_SERIAL putty -serial COM2 -sercfg 57600,8,n,1,X )
-	
-include_directories(
-${ARDUINO_LIBRARIES_PATH}/Wire
-${CMAKE_SOURCE_DIR}/libraries/APO
-${CMAKE_SOURCE_DIR}/libraries/AP_Common
-${CMAKE_SOURCE_DIR}/libraries/FastSerial
-${CMAKE_SOURCE_DIR}/libraries/ModeFilter
-${CMAKE_SOURCE_DIR}/libraries/AP_Compass
-${CMAKE_SOURCE_DIR}/libraries/AP_RangeFinder
-${CMAKE_SOURCE_DIR}/libraries/AP_GPS
-${CMAKE_SOURCE_DIR}/libraries/AP_IMU
-${CMAKE_SOURCE_DIR}/libraries/AP_ADC
-${CMAKE_SOURCE_DIR}/libraries/AP_DCM
-${CMAKE_SOURCE_DIR}/libraries/APM_RC
-${CMAKE_SOURCE_DIR}/libraries/GCS_MAVLink
-${CMAKE_SOURCE_DIR}/libraries/APM_BMP085
-)
-
-add_subdirectory(../libraries "${CMAKE_CURRENT_BINARY_DIR}/libs")
-
-set(${PROJECT_NAME}_BOARD ${BOARD})
-file(GLOB ${PROJECT_NAME}_SKETCHES *.pde)
-file(GLOB ${PROJECT_NAME}_SRCS *.cpp)
-file(GLOB ${PROJECT_NAME}_HDRS *.h)
-set(${PROJECT_NAME}_LIBS
-	c
-    m
-    APO
-    FastSerial
-    AP_Common
-    GCS_MAVLink
-    AP_GPS
-    APM_RC
-    AP_DCM
-    AP_ADC
-    AP_Compass
-    AP_IMU
-    AP_RangeFinder
-    APM_BMP085
-	ModeFilter
-)
-
-
-
-
-
-generate_arduino_firmware(${PROJECT_NAME})
-
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.hex 
-	DESTINATION bin
-	)
diff --git a/cmake/modules/FindArduino.cmake b/cmake/modules/FindArduino.cmake
index 1d57edbf26276ca59938cf7c1b79e9dc98c80a4d..e53873e9ad4723ca1cd0e467232796cbc5fa3502 100644
--- a/cmake/modules/FindArduino.cmake
+++ b/cmake/modules/FindArduino.cmake
@@ -279,7 +279,7 @@ function(setup_arduino_core VAR_NAME BOARD_ID)
     set(BOARD_CORE ${${BOARD_ID}.build.core})
     if(BOARD_CORE AND NOT TARGET ${CORE_LIB_NAME})
         set(BOARD_CORE_PATH ${ARDUINO_CORES_PATH}/${BOARD_CORE})
-        find_sources(CORE_SRCS ${BOARD_CORE_PATH})
+        find_sources(CORE_SRCS ${BOARD_CORE_PATH} True)
 		list(REMOVE_ITEM CORE_SRCS "${BOARD_CORE_PATH}/main.cxx")
         add_library(${CORE_LIB_NAME} ${CORE_SRCS})
         set(${VAR_NAME} ${CORE_LIB_NAME} PARENT_SCOPE)
@@ -340,12 +340,23 @@ endfunction()
 #
 # Creates an Arduino library, with all it's library dependencies.
 #
+#		"LIB_NAME"_RECURSE controls if the library will recurse
+# 		when looking for source files
+#
+
+# For known libraries can list recurse here
+set(Wire_RECURSE True)
 function(setup_arduino_library VAR_NAME BOARD_ID LIB_PATH)
     set(LIB_TARGETS)
     get_filename_component(LIB_NAME ${LIB_PATH} NAME)
     set(TARGET_LIB_NAME ${BOARD_ID}_${LIB_NAME})
     if(NOT TARGET ${TARGET_LIB_NAME})
-        find_sources(LIB_SRCS ${LIB_PATH})
+		string(REGEX REPLACE ".*/" "" LIB_SHORT_NAME ${LIB_NAME})
+		#message(STATUS "short name: ${LIB_SHORT_NAME} recures: ${${LIB_SHORT_NAME}_RECURSE}")
+		if (NOT DEFINED ${LIB_SHORT_NAME}_RECURSE)
+			set(${LIB_SHORT_NAME}_RECURSE False)
+		endif()
+		find_sources(LIB_SRCS ${LIB_PATH} ${${LIB_SHORT_NAME}_RECURSE})
         if(LIB_SRCS)
 
             message(STATUS "Generating Arduino ${LIB_NAME} library")
@@ -448,21 +459,29 @@ function(setup_arduino_upload BOARD_ID TARGET_NAME PORT)
     add_dependencies(upload ${TARGET_NAME}-upload)
 endfunction()
 
-# find_sources(VAR_NAME LIB_PATH)
+# find_sources(VAR_NAME LIB_PATH RECURSE)
 #
 #        VAR_NAME - Variable name that will hold the detected sources
 #        LIB_PATH - The base path
+#        RECURSE  - Whether or not to recurse
 #
 # Finds all C/C++ sources located at the specified path.
 #
-function(find_sources VAR_NAME LIB_PATH)
-    file(GLOB_RECURSE LIB_FILES ${LIB_PATH}/*.cpp
-                                ${LIB_PATH}/*.c
-                                ${LIB_PATH}/*.cc
-                                ${LIB_PATH}/*.cxx
-                                ${LIB_PATH}/*.h
-                                ${LIB_PATH}/*.hh
-                                ${LIB_PATH}/*.hxx)
+function(find_sources VAR_NAME LIB_PATH RECURSE)
+	set(FILE_SEARCH_LIST
+		${LIB_PATH}/*.cpp
+		${LIB_PATH}/*.c
+		${LIB_PATH}/*.cc
+		${LIB_PATH}/*.cxx
+		${LIB_PATH}/*.h
+		${LIB_PATH}/*.hh
+		${LIB_PATH}/*.hxx)
+	if (RECURSE)
+		file(GLOB_RECURSE LIB_FILES ${FILE_SEARCH_LIST})
+	else()
+		file(GLOB LIB_FILES ${FILE_SEARCH_LIST})
+	endif()
+	#message(STATUS "${LIB_PATH} recurse: ${RECURSE}")
     if(LIB_FILES)
         set(${VAR_NAME} ${LIB_FILES} PARENT_SCOPE)
     endif()
diff --git a/libraries/APM_BMP085/CMakeLists.txt b/libraries/APM_BMP085/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/APM_BMP085/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/APM_PI/CMakeLists.txt b/libraries/APM_PI/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/APM_PI/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/APM_PerfMon/CMakeLists.txt b/libraries/APM_PerfMon/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/APM_PerfMon/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/APM_RC/CMakeLists.txt b/libraries/APM_RC/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/APM_RC/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/APO/CMakeLists.txt b/libraries/APO/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/APO/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_ADC/CMakeLists.txt b/libraries/AP_ADC/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_ADC/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_Common/CMakeLists.txt b/libraries/AP_Common/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_Common/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_Compass/CMakeLists.txt b/libraries/AP_Compass/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_Compass/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_DCM/CMakeLists.txt b/libraries/AP_DCM/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_DCM/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_EEPROMB/CMakeLists.txt b/libraries/AP_EEPROMB/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_EEPROMB/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_GPS/CMakeLists.txt b/libraries/AP_GPS/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_GPS/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_IMU/CMakeLists.txt b/libraries/AP_IMU/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_IMU/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_Math/CMakeLists.txt b/libraries/AP_Math/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_Math/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_Navigation/CMakeLists.txt b/libraries/AP_Navigation/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_Navigation/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_OpticalFlow/CMakeLists.txt b/libraries/AP_OpticalFlow/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_OpticalFlow/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_PID/CMakeLists.txt b/libraries/AP_PID/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_PID/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_RC/CMakeLists.txt b/libraries/AP_RC/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_RC/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_RC_Channel/CMakeLists.txt b/libraries/AP_RC_Channel/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_RC_Channel/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/AP_RangeFinder/CMakeLists.txt b/libraries/AP_RangeFinder/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/AP_RangeFinder/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
deleted file mode 100644
index 0d8ac428861eae1e4efb6e623b44b5c4d94dc726..0000000000000000000000000000000000000000
--- a/libraries/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-add_subdirectory(AP_ADC)
-add_subdirectory(AP_Common)
-add_subdirectory(AP_Compass)
-add_subdirectory(AP_DCM)
-add_subdirectory(AP_EEPROMB)
-add_subdirectory(AP_GPS)
-add_subdirectory(AP_IMU)
-add_subdirectory(AP_Math)
-add_subdirectory(APM_BMP085)
-add_subdirectory(APM_PerfMon)
-add_subdirectory(APM_PI)
-add_subdirectory(APM_RC)
-add_subdirectory(AP_Navigation)
-add_subdirectory(APO)
-add_subdirectory(AP_OpticalFlow)
-add_subdirectory(AP_PID)
-add_subdirectory(AP_RangeFinder)
-add_subdirectory(AP_RC)
-add_subdirectory(AP_RC_Channel)
-add_subdirectory(DataFlash)
-add_subdirectory(FastSerial)
-add_subdirectory(GCS_MAVLink)
-add_subdirectory(GCS_SIMPLE)
-add_subdirectory(GPS_IMU)
-add_subdirectory(GPS_MTK)
-add_subdirectory(GPS_NMEA)
-add_subdirectory(GPS_UBLOX)
-add_subdirectory(memcheck)
-add_subdirectory(ModeFilter)
-add_subdirectory(PID)
-add_subdirectory(RC_Channel)
-add_subdirectory(Waypoints)
-add_subdirectory(Trig_LUT)
-
diff --git a/libraries/DataFlash/CMakeLists.txt b/libraries/DataFlash/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/DataFlash/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/FastSerial/CMakeLists.txt b/libraries/FastSerial/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/FastSerial/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/GCS_MAVLink/CMakeLists.txt b/libraries/GCS_MAVLink/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/GCS_MAVLink/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/GCS_SIMPLE/CMakeLists.txt b/libraries/GCS_SIMPLE/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/GCS_SIMPLE/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/GPS_IMU/CMakeLists.txt b/libraries/GPS_IMU/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/GPS_IMU/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/GPS_MTK/CMakeLists.txt b/libraries/GPS_MTK/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/GPS_MTK/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/GPS_NMEA/CMakeLists.txt b/libraries/GPS_NMEA/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/GPS_NMEA/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/GPS_UBLOX/CMakeLists.txt b/libraries/GPS_UBLOX/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/GPS_UBLOX/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/ModeFilter/CMakeLists.txt b/libraries/ModeFilter/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/ModeFilter/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/PID/CMakeLists.txt b/libraries/PID/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/PID/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/RC_Channel/CMakeLists.txt b/libraries/RC_Channel/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/RC_Channel/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/Trig_LUT/CMakeLists.txt b/libraries/Trig_LUT/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/Trig_LUT/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/Waypoints/CMakeLists.txt b/libraries/Waypoints/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/Waypoints/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)
diff --git a/libraries/memcheck/CMakeLists.txt b/libraries/memcheck/CMakeLists.txt
deleted file mode 100644
index 03e7091ff3f6571798000e5700c48c4e33962235..0000000000000000000000000000000000000000
--- a/libraries/memcheck/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(ApmMakeLib)