[DEV] remove catkin an CMake builder

CMakeLists.txt

@@ -1,95 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-# Declare the project
-project(etk CXX)
-
-##
-## Include C++ X11 dependency ... (check correct flags)
-##
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-if(COMPILER_SUPPORTS_CXX11)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-else()
-	CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-	if(COMPILER_SUPPORTS_CXX0X)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-	else()
-		message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-	endif()
-endif()
-
-
-
-
-# set output path:
-set(LIBRARY_OUTPUT_PATH lib/${CMAKE_BUILD_TYPE})
-
-include_directories(.)
-
-
-#Create src file list
-set(src_files
-	etk/debugGeneric.cpp
-	etk/debugGeneric.h
-	etk/debug.cpp
-	etk/debug.h
-	etk/stdTools.cpp
-	etk/stdTools.h
-	etk/Stream.cpp
-	etk/Stream.h
-	etk/tool.cpp
-	etk/tool.h
-	etk/Noise.cpp
-	etk/Noise.h
-	etk/Color.cpp
-	etk/Color.h
-	etk/math/Matrix4.cpp
-	etk/math/Matrix4.h
-	etk/math/Vector2D.cpp
-	etk/math/Vector2D.h
-	etk/math/Vector3D.cpp
-	etk/math/Vector3D.h
-	etk/math/Vector4D.cpp
-	etk/math/Vector4D.h
-	etk/os/FSNode.cpp
-	etk/os/FSNode.h
-	etk/os/FSNodeRight.cpp
-	etk/os/FSNodeRight.h
-	etk/archive/Archive.cpp
-	etk/archive/Archive.h
-	etk/archive/Zip.cpp
-	etk/archive/Zip.h
-	etk/os/Mutex.Generic.cpp
-	etk/os/Mutex.h
-	etk/os/Semaphore.Generic.cpp
-	etk/os/Semaphore.h
-)
-
-add_definitions( -DDEBUG_LEVEL=3 )
-add_definitions( -DDEBUG=1 )
-if (APPLE)
-	add_definitions( -D__TARGET_OS__MacOs )
-elseif (UNIX)
-	add_definitions( -D__TARGET_OS__Linux )
-elseif (WIN32)
-	add_definitions( -D__TARGET_OS__Windows )
-endif ()
-
-
-#Create a static Lib:
-add_library(etk STATIC ${src_files} )
-
-include_directories(${zlib_SOURCE_DIR}/contrib/)
-include_directories(${linearmath_SOURCE_DIR}/bullet/src/)
-
-target_link_libraries(etk linearmath zlib)
-
-#myModule.add_export_flag_LD("-lpthread")
-
-
-# display all variable ...
-#get_cmake_property(_variableNames VARIABLES)
-#foreach (_variableName ${_variableNames})
-#    message(STATUS "${_variableName}=${${_variableName}}")
-#endforeach()

catkin/CMakeLists.txt

@@ -1,80 +0,0 @@
-cmake_minimum_required(VERSION 2.8.3)
-project(etk)
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-## Find catkin macros and libraries
-## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
-## is used, also find other catkin packages
-find_package(catkin)
-
-###################################
-## catkin specific configuration ##
-###################################
-## The catkin_package macro generates cmake config files for your package
-## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if you package contains header files
-## LIBRARIES: libraries you create in this project that dependent projects also need
-## CATKIN_DEPENDS: catkin_packages dependent projects also need
-## DEPENDS: system dependencies of this project that dependent projects also need
-catkin_package(
-  INCLUDE_DIRS ../ ../binding_X11
-  LIBRARIES ${PROJECT_NAME}
-  DEPENDS system_lib rosconsole
-  CFG_EXTRAS ${PROJECT_NAME}-extras.cmake
-)
-
-###########
-## Build ##
-###########
-
-## Specify additional locations of header files
-## Your package locations should be listed before other locations
-include_directories(
-  ..
-  ../binding_X11
-  ${catkin_INCLUDE_DIRS}
-)
-
-## Declare a cpp library
-add_library(${PROJECT_NAME}
-  ../${PROJECT_NAME}/debug.cpp
-  ../${PROJECT_NAME}/etk.cpp
-  ../${PROJECT_NAME}/stdTools.cpp
-  ../${PROJECT_NAME}/log.cpp
-  ../${PROJECT_NAME}/tool.cpp
-  ../${PROJECT_NAME}/Noise.cpp
-  ../${PROJECT_NAME}/Color.cpp
-  ../${PROJECT_NAME}/thread/tools.cpp
-  ../${PROJECT_NAME}/math/Matrix4.cpp
-  ../${PROJECT_NAME}/math/Vector2D.cpp
-  ../${PROJECT_NAME}/math/Vector3D.cpp
-  ../${PROJECT_NAME}/math/Vector4D.cpp
-  ../${PROJECT_NAME}/os/FSNode.cpp
-  ../${PROJECT_NAME}/os/FSNodeRight.cpp
-  ../${PROJECT_NAME}/archive/Archive.cpp
-  ../${PROJECT_NAME}/archive/Zip.cpp
-)
-
-set(CMAKE_CXX_FLAGS "-std=c++11 -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS")
-
-## Specify libraries to link a library or executable target against
-target_link_libraries(${PROJECT_NAME}
-  ${catkin_LIBRARIES}
-)
-
-#############
-## Install ##
-#############
-
-## Mark executables and/or libraries for installation
-install(TARGETS ${PROJECT_NAME}
-  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-)
-
-## Mark cpp header files for installation
-install(DIRECTORY ../${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.h"
-)

catkin/cmake/etk-extras.cmake

@@ -1,4 +0,0 @@
-
-
-set(CMAKE_CXX_FLAGS "-std=c++11 -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS ${CMAKE_CXX_FLAGS}")
-

catkin/package.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <name>etk</name>
-  <version>0.9.1</version>
-  <description>Ewol Tool kit</description>
-  <maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
-  <license>Apache-2.0</license>
-  <build_depend>rosconsole</build_depend>
-  <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>rosconsole</run_depend>
-</package>

lutin_etk.py

@@ -95,13 +95,8 @@ def create(target, module_name):
 	my_module.add_optionnal_depend('minizip', ["c++", "-DETK_BUILD_MINIZIP"])
 	my_module.add_optionnal_depend('linearmath', ["c", "-DETK_BUILD_LINEARMATH"], export=True)
 	
-	if "Windows" in target.get_type():
+	if "Android" in target.get_type():
-		pass
-	elif "Android" in target.get_type():
 		my_module.add_depend("SDK")
-		pass
-	else:
-		my_module.add_depend("pthread")
 	
 	my_module.add_path(tools.get_current_path(__file__))
 	return my_module