30.11.2013 - New PICollection namespace, Android support, my own PIVector implementation

CMakeLists.txt

@@ -2,11 +2,11 @@ project(pip)
 cmake_minimum_required(VERSION 2.6)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} .)
 include(CheckFunctionExists)
-set(VERSION "0.0306")
+set(VERSION "0.0307")
 set(SOVERSION ${VERSION})
 set(CMAKE_BUILD_TYPE "Release")
 set(LIBS)
-file(GLOB CPPS "pi*.cpp")
+file(GLOB CPPS "pi*.cpp" "ifaddrs_3rd.c")
 
 
 # Check Bessel functions
@@ -49,6 +49,16 @@ else ()
 endif ()
 
 
+# Check if STL containers is on (to enable use "-DPIP_CONTAINERS_STL=" argument of cmake)
+if (DEFINED PIP_CONTAINERS_STL)
+	message(STATUS "Building with STL containers")
+	unset(PIP_CONTAINERS_STL)
+	add_definitions("-DPIP_CONTAINERS_STL")
+else ()
+	message(STATUS "Building with PIP containers")
+endif ()
+
+
 if (${WIN32})
 	list(APPEND LIBS ws2_32 Iphlpapi)
 	execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
@@ -77,11 +87,14 @@ else ()
 	endif ()
 endif ()
 target_link_libraries(pip ${LIBS})
+install(TARGETS pip DESTINATION bin)
 
 
 # Test program
+find_package(Qt4 REQUIRED)
+include_directories(${QT_INCLUDES})
 add_executable(pip_test "main.cpp")
-target_link_libraries(pip_test pip)
+target_link_libraries(pip_test pip ${QT_QTCORE_LIBRARY})
 
 
 add_subdirectory(system_test)