Update Coin3D external projects

Author: rickertm

3rdparty/CMakeLists.txt

@@ -28,6 +28,11 @@ else()
 	set(PATCH_EXECUTABLE patch)
 endif()
 
+add_subdirectory(coin3d/boost-header-libs-full)
+add_subdirectory(coin3d/cpack.d)
+add_subdirectory(coin3d/soanydata)
+add_subdirectory(coin3d/sogui)
+
 add_subdirectory(atidaq)
 add_subdirectory(boost)
 add_subdirectory(bullet)
@@ -36,15 +41,15 @@ add_subdirectory(libiconv)
 add_subdirectory(nlopt)
 add_subdirectory(ode)
 add_subdirectory(pqp)
-add_subdirectory(simage)
+add_subdirectory(coin3d/simage)
 add_subdirectory(solid)
 add_subdirectory(zlib)
 
 add_subdirectory(libxml2)
-add_subdirectory(coin)
+add_subdirectory(coin3d/coin)
 
 add_subdirectory(libxslt)
-add_subdirectory(soqt)
+add_subdirectory(coin3d/soqt)
 
 set(
 	CPACK_INSTALL_CMAKE_PROJECTS

3rdparty/coin3d/boost-header-libs-full/CMakeLists.txt

@@ -0,0 +1,12 @@
+include(ExternalProject)
+
+ExternalProject_Add(
+	boost-header-libs-full
+	#HG_REPOSITORY https://bitbucket.org/Coin3D/boost-header-libs-full
+	#HG_TAG default
+	URL https://bitbucket.org/Coin3D/boost-header-libs-full/get/default.tar.bz2
+	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND ""
+	INSTALL_COMMAND ""
+)

3rdparty/coin/CMakeLists.txt renamed to 3rdparty/coin3d/coin/CMakeLists.txt

@@ -1,27 +1,17 @@
 include(ExternalProject)
 
-ExternalProject_Add(
-	boost-header-libs-full
-	#HG_REPOSITORY https://bitbucket.org/Coin3D/boost-header-libs-full
-	#HG_TAG default
-	URL https://bitbucket.org/Coin3D/boost-header-libs-full/get/default.tar.bz2
-	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-)
-
 list(INSERT CMAKE_PREFIX_PATH 0 ${CMAKE_INSTALL_PREFIX})
 
 ExternalProject_Add(
 	coin
-	DEPENDS boost-header-libs-full simage
+	DEPENDS boost-header-libs-full cpack.d simage
 	#HG_REPOSITORY https://bitbucket.org/Coin3D/coin
 	#HG_TAG default
 	URL https://bitbucket.org/Coin3D/coin/get/default.tar.bz2
 	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
 	PATCH_COMMAND
-	${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/boost-header-libs-full-prefix/src/boost-header-libs-full <SOURCE_DIR>/include/boost
+	${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../cpack.d/cpack.d-prefix/src/cpack.d <SOURCE_DIR>/cpack.d &&
+	${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../boost-header-libs-full/boost-header-libs-full-prefix/src/boost-header-libs-full <SOURCE_DIR>/include/boost
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CFG_INTDIR=${CMAKE_CFG_INTDIR} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_TRY_COMPILE_CONFIGURATION=${CMAKE_TRY_COMPILE_CONFIGURATION} -DCOIN_BUILD_DOCUMENTATION=OFF
 	INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
 )

3rdparty/coin3d/cpack.d/CMakeLists.txt

@@ -0,0 +1,12 @@
+include(ExternalProject)
+
+ExternalProject_Add(
+	cpack.d
+	#HG_REPOSITORY https://bitbucket.org/Coin3D/cpack.d
+	#HG_TAG default
+	URL https://bitbucket.org/Coin3D/cpack.d/get/default.tar.bz2
+	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND ""
+	INSTALL_COMMAND ""
+)

3rdparty/simage/CMakeLists.txt renamed to 3rdparty/coin3d/simage/CMakeLists.txt

@@ -1,15 +1,14 @@
-cmake_minimum_required(VERSION 2.8.11)
-
-project(simage)
-
 include(ExternalProject)
 
 ExternalProject_Add(
 	simage
+	DEPENDS cpack.d
 	#HG_REPOSITORY https://bitbucket.org/Coin3D/simage
 	#HG_TAG default
 	URL https://bitbucket.org/Coin3D/simage/get/default.tar.bz2
 	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
+	PATCH_COMMAND
+	${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../cpack.d/cpack.d-prefix/src/cpack.d <SOURCE_DIR>/cpack.d
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CFG_INTDIR=${CMAKE_CFG_INTDIR} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_TRY_COMPILE_CONFIGURATION=${CMAKE_TRY_COMPILE_CONFIGURATION}
 	INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
 )

3rdparty/coin3d/soanydata/CMakeLists.txt

@@ -0,0 +1,12 @@
+include(ExternalProject)
+
+ExternalProject_Add(
+	soanydata
+	#HG_REPOSITORY https://bitbucket.org/Coin3D/soanydata
+	#HG_TAG default
+	URL https://bitbucket.org/Coin3D/soanydata/get/default.tar.bz2
+	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND ""
+	INSTALL_COMMAND ""
+)

3rdparty/coin3d/sogui/CMakeLists.txt

@@ -0,0 +1,12 @@
+include(ExternalProject)
+
+ExternalProject_Add(
+	sogui
+	#HG_REPOSITORY https://bitbucket.org/Coin3D/sogui
+	#HG_TAG default
+	URL https://bitbucket.org/Coin3D/sogui/get/default.tar.bz2
+	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND ""
+	INSTALL_COMMAND ""
+)

3rdparty/soqt/CMakeLists.txt renamed to 3rdparty/coin3d/soqt/CMakeLists.txt

@@ -1,27 +1,18 @@
 include(ExternalProject)
 
-ExternalProject_Add(
-	sogui
-	#HG_REPOSITORY https://bitbucket.org/Coin3D/sogui
-	#HG_TAG default
-	URL https://bitbucket.org/Coin3D/sogui/get/default.tar.bz2
-	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-)
-
 list(INSERT CMAKE_PREFIX_PATH 0 ${CMAKE_INSTALL_PREFIX})
 
 ExternalProject_Add(
 	soqt
-	DEPENDS sogui coin
+	DEPENDS cpack.d soanydata sogui coin
 	#HG_REPOSITORY https://bitbucket.org/Coin3D/soqt
 	#HG_TAG default
 	URL https://bitbucket.org/Coin3D/soqt/get/default.tar.bz2
 	#URL ${CMAKE_CURRENT_SOURCE_DIR}/default.tar.bz2
 	PATCH_COMMAND
-	${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/sogui-prefix/src/sogui <SOURCE_DIR>/src/Inventor/Qt/common
+	${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../cpack.d/cpack.d-prefix/src/cpack.d <SOURCE_DIR>/cpack.d &&
+	${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../soanydata/soanydata-prefix/src/soanydata <SOURCE_DIR>/data &&
+	${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/../sogui/sogui-prefix/src/sogui <SOURCE_DIR>/src/Inventor/Qt/common
 	CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CFG_INTDIR=${CMAKE_CFG_INTDIR} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_TRY_COMPILE_CONFIGURATION=${CMAKE_TRY_COMPILE_CONFIGURATION} -DSOQT_BUILD_DOCUMENTATION=OFF
 	INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
 )