cmake is an externalproject instead of a submodule

.gitignore

@@ -17,124 +17,33 @@
 *.snm
 *.nav
 *~
-util/drake_config.mat
-doc/derivations/elib.bib
-doc/analysis.tex
-doc/autogen-matlab
-doc/feedback.tex
-doc/modeling.tex
-doc/planning.tex
+externals
+drake/util/drake_config.mat
+drake/doc/derivations/elib.bib
 fort.*
-drake.a
-include/lcmt_acrobot_u.h
-include/lcmt_acrobot_x.h
-include/lcmt_acrobot_y.h
-include/lcmt_cartpole_u.h
-include/lcmt_cartpole_x.h
-include/lcmt_glider_u.h
-include/lcmt_glider_x.h
-include/lcmt_pendulum_u.h
-include/lcmt_pendulum_x.h
-include/lcmt_pendulum_y.h
-include/lcmt_scope_data.h
 *.aux
 .drake_unit_test_mutex.mat
 .unitTestData.mat
 debug.txt
 stepping.mat
 walking.mat
-doc/DoxygenMatlab/html
+drake/doc/DoxygenMatlab/html
 .viewer-prefs
-include/lcmt_drake_signal.h
-include/lcmt_huboplus_input.h
-include/lcmt_huboplus_sensors.h
-include/lcmt_huboplus_state.h
-include/lcmt_robot_state.h
-include/lcmt_viewer_command.h
 .matlabroot
 *.dSYM
 data_t.java
-gurobi.pc
-eigen3.pc
-util/debugMex
-util/test/debugMexTest_mexdebug.mat
+drake/util/test/debugMexTest_mexdebug.mat
 *_mexdebug.mat
 *.class
 tmp_w.mat
 bin
 drake.jar
 *.out
-urdf_kin_test
 pod-build
-lcmtypes/c
-lcmtypes/cpp
-lcmtypes/java
-lcmtypes/python
 build
 mlint_output.html
-doc/DoxygenMatlab/latex
-doc/urdf
-doc/ik.pdf
-doc/rigidbody.tex
-solvers/test/failed_paths
-solvers/test/finite_solutions
-solvers/test/input.bert
-solvers/test/main_data
-solvers/test/midpath_data
-solvers/test/nonsingular_solutions
-solvers/test/output
-solvers/test/output_1
-solvers/test/output_2
-solvers/test/output_3
-solvers/test/output_4
-solvers/test/output_5
-solvers/test/output_6
-solvers/test/output_7
-solvers/test/raw_data
-solvers/test/raw_solutions
-solvers/test/real_finite_solutions
-solvers/test/regenSummary
-solvers/test/singular_solutions
-solvers/test/startRegen_0
-solvers/test/startRegen_1
 .#*
 VALGRIND_OUTPUT.xml
 *.ppms.gz
 glider_trajs.mat
-examples/PR2/pr2_description/meshes/base_v0/base_L.wrl
-examples/PR2/pr2_description/meshes/base_v0/caster_L.wrl
-examples/PR2/pr2_description/meshes/forearm_v0/forearm.wrl
-examples/PR2/pr2_description/meshes/forearm_v0/wrist_flex.wrl
-examples/PR2/pr2_description/meshes/forearm_v0/wrist_roll_L.wrl
-examples/PR2/pr2_description/meshes/gripper_v0/gripper_palm.wrl
-examples/PR2/pr2_description/meshes/gripper_v0/l_finger.wrl
-examples/PR2/pr2_description/meshes/gripper_v0/l_finger_tip.wrl
-examples/PR2/pr2_description/meshes/head_v0/head_pan_L.wrl
-examples/PR2/pr2_description/meshes/head_v0/head_tilt_L.wrl
-examples/PR2/pr2_description/meshes/shoulder_v0/shoulder_lift.wrl
-examples/PR2/pr2_description/meshes/shoulder_v0/shoulder_pan.wrl
-examples/PR2/pr2_description/meshes/shoulder_v0/upper_arm_roll_L.wrl
-examples/PR2/pr2_description/meshes/tilting_laser_v0/tilting_hokuyo_L.wrl
-examples/PR2/pr2_description/meshes/torso_v0/torso_lift_L.wrl
-examples/PR2/pr2_description/meshes/upper_arm_v0/elbow_flex.wrl
-examples/PR2/pr2_description/meshes/upper_arm_v0/forearm_roll_L.wrl
-examples/PR2/pr2_description/meshes/upper_arm_v0/upper_arm.wrl
-examples/IRB140/urdf/meshes/ATI_sensor.wrl
-examples/IRB140/urdf/meshes/base_link.wrl
-examples/IRB140/urdf/meshes/link1.wrl
-examples/IRB140/urdf/meshes/link2.wrl
-examples/IRB140/urdf/meshes/link3.wrl
-examples/IRB140/urdf/meshes/link4.wrl
-examples/IRB140/urdf/meshes/link5.wrl
-examples/IRB140/urdf/meshes/link6.wrl
-examples/PR2/pr2_description/meshes/base_v0/base.wrl
-examples/PR2/pr2_description/meshes/base_v0/caster.wrl
-examples/PR2/pr2_description/meshes/base_v0/wheel.wrl
-examples/PR2/pr2_description/meshes/forearm_v0/wrist_roll.wrl
-examples/PR2/pr2_description/meshes/head_v0/head_pan.wrl
-examples/PR2/pr2_description/meshes/head_v0/head_tilt.wrl
-examples/PR2/pr2_description/meshes/shoulder_v0/upper_arm_roll.wrl
-examples/PR2/pr2_description/meshes/tilting_laser_v0/tilting_hokuyo.wrl
-examples/PR2/pr2_description/meshes/torso_v0/torso_lift.wrl
-examples/PR2/pr2_description/meshes/upper_arm_v0/forearm_roll.wrl
 results_testRunning.mat

CMakeLists.txt

@@ -51,7 +51,7 @@ set(MAKE_COMMAND ${MAKE_EXECUTABLE} $ENV{MAKEFLAGS}) # didn't work on my first t
 # process optional projects
 # note: keep drake in this loop in case externals depend on drake (e.g. the director might in the near future)
 set(EXTERNAL_PROJECTS)
-foreach(proj IN ITEMS eigen gtk lcm libbot bullet iris spotless director octomap snopt gurobi mosek yalmip gloptipoly bertini sedumi avl xfoil drake)
+foreach(proj IN ITEMS cmake eigen gtk lcm libbot bullet iris spotless director octomap snopt gurobi mosek yalmip gloptipoly bertini sedumi avl xfoil drake)
 	string(TOUPPER ${proj} proj_upper)
 	if (${proj} STREQUAL "drake" OR WITH_${proj_upper} OR WITH_ALL_SUPPORTED_EXTERNALS)
 		list(APPEND EXTERNAL_PROJECTS ${proj})
@@ -90,7 +90,7 @@ endif()
 set(lcm_dependencies gtk)
 set(libbot_dependencies lcm)
 set(director_dependencies lcm libbot)
-set(drake_dependencies eigen lcm libbot bullet octomap snopt gurobi)
+set(drake_dependencies cmake eigen lcm libbot bullet octomap snopt gurobi)
 
 # download information, in alphabetical order
 find_package(Git QUIET)
@@ -100,6 +100,9 @@ set(bertini_GIT_REPOSITORY https://github.com/RobotLocomotion/bertini.git)
 set(bertini_GIT_TAG 3ae3e3ad3534acb4b6f7a4c3c22728b493beaa80)
 set(bullet_GIT_REPOSITORY https://github.com/RobotLocomotion/bullet-pod.git)
 set(bullet_GIT_TAG 6db7ae5e29f8b35ffcea384c53caa4bddcc6f986)
+set(cmake_GIT_REPOSITORY https://github.com/RobotLocomotion/cmake.git)
+set(cmake_GIT_TAG c48d1e461d8f0a8d67ebba3e4acb19d96dd5a25b)
+set(cmake_GIT_CLONE_DIR "${PROJECT_SOURCE_DIR}/drake/cmake")
 set(director_GIT_REPOSITORY https://github.com/RobotLocomotion/director.git)
 set(director_GIT_TAG f44045f75e931165d9f519b989bdbd1ad8e70b08)
 set(director_SOURCE_DIR ${PROJECT_SOURCE_DIR}/externals/director/distro/pods/drake-distro)
@@ -151,7 +154,7 @@ foreach (proj ${EXTERNAL_PROJECTS})
 		endif()
 	endforeach()
 
-	if (${proj} STREQUAL "drake")
+	if (NOT ${proj} STREQUAL "drake")
 		if (NOT ${proj}_GIT_CLONE_DIR)
 			set(${proj}_GIT_CLONE_DIR "${PROJECT_SOURCE_DIR}/externals/${proj}")
 		endif()
@@ -199,8 +202,10 @@ foreach (proj ${EXTERNAL_PROJECTS})
 	#		BUILD_ALWAYS 1
 			)
 	else()
+		message(STATUS "Preparing to build ${proj} with dependencies: ${deps}")
+
 		ExternalProject_Add(${proj} 
-			SOURCE_DIR ${${proj}_SOURCE_DIR}
+			SOURCE_DIR "${PROJECT_SOURCE_DIR}/drake"
 			DOWNLOAD_COMMAND ""
 			UPDATE_COMMAND ""
 			CONFIGURE_COMMAND ""
@@ -210,7 +215,7 @@ foreach (proj ${EXTERNAL_PROJECTS})
 			DEPENDS ${deps}
 	#		BUILD_ALWAYS 1
 			)
-	endif(${proj} STREQUAL "drake") 
+	endif(NOT ${proj} STREQUAL "drake") 
 
 
 	# once we require cmake version >= 3.1, then we can zap this and just use the BUILD_ALWAYS flags above