X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdipp%2FCMakeLists.txt;h=a9e3418682f39800167dff83b40cd0e20b6e205b;hp=8f581ef895609e168705efa98392826e40f19b38;hb=51962d0874d4e731ff6ed93dbe838d4d4fcec55c;hpb=6d4f7fbac8e34f674ce9b4c82492af2bed014541

diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index 8f581ef..a9e3418 100644
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -1,72 +1,47 @@
-# Check
-set(FTDI_BUILD_CPP False PARENT_SCOPE)
-
-option ( FTDIPP "Build C++ binding library libftdi1++" ON )
+# vim: ts=2:sw=2:sts=2
 
 # Targets
-set(cpp_sources   ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.cpp CACHE INTERNAL "List of cpp sources" )
-set(cpp_headers   ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.hpp CACHE INTERNAL "List of cpp headers" )
-        
-if (FTDIPP)
-
-  if(Boost_FOUND)
-
-    # Includes
-    include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
-                        ${CMAKE_CURRENT_SOURCE_DIR}
-                        ${CMAKE_SOURCE_DIR}/src)
-
-    include_directories(${Boost_INCLUDE_DIRS})
+set(cpp_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.cpp CACHE INTERNAL "List of cpp sources" )
+set(cpp_headers ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.hpp CACHE INTERNAL "List of cpp headers" )
 
+# Includes
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/src)
 
+include_directories(${Boost_INCLUDE_DIRS})
 
-    set(FTDI_BUILD_CPP True PARENT_SCOPE)
-    message(STATUS "Building libftdi1++")
+# Shared library
+add_library(ftdipp1 SHARED ${cpp_sources})
 
-    # Shared library
-    add_library(ftdipp1 SHARED ${cpp_sources})
+math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases
+set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 3)
 
-    math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases
-    set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
+# Prevent clobbering each other during the build
+set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
-    # Static library
-    if (STATICLIBS)
-        add_library(ftdipp1-static STATIC ${cpp_sources})
-        set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
-    endif (STATICLIBS)
+# Dependencies
+target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
 
-    # Prevent clobbering each other during the build
-    set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    if (STATICLIBS)
-        set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    endif (STATICLIBS)
+install ( TARGETS ftdipp1
+					RUNTIME DESTINATION bin
+					LIBRARY DESTINATION lib${LIB_SUFFIX}
+					ARCHIVE DESTINATION lib${LIB_SUFFIX}
+				)
 
-    # Dependencies
-    target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
+# Static library
+if ( STATICLIBS )
+	add_library(ftdipp1-static STATIC ${cpp_sources})
+	set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
+	set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
-    
-    install ( TARGETS ftdipp1
-              RUNTIME DESTINATION bin
-              LIBRARY DESTINATION lib${LIB_SUFFIX}
-              ARCHIVE DESTINATION lib${LIB_SUFFIX}
-            )
-    
-    if ( STATICLIBS )
-      install ( TARGETS ftdipp1-static
-                ARCHIVE DESTINATION lib${LIB_SUFFIX}
-                COMPONENT staticlibs
-              )
-    endif ()
-
-    install ( FILES ${cpp_headers}
-              DESTINATION include/${PROJECT_NAME}
-              COMPONENT headers
-            )
-
-  else ()
-    message(STATUS "Boost not found, won't build libftdi1++")
-  endif ()
-
-else ()
-  message(STATUS "Not building libftdi1++")
+	install ( TARGETS ftdipp1-static
+						ARCHIVE DESTINATION lib${LIB_SUFFIX}
+						COMPONENT staticlibs
+					)
 endif ()
+
+install ( FILES ${cpp_headers}
+					DESTINATION include/${PROJECT_NAME}
+					COMPONENT headers
+				)