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

diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index d3a22ce..8f581ef 100644
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Check
 set(FTDI_BUILD_CPP False PARENT_SCOPE)
 
-option(FTDIPP "Build C++ binding library libftdi1++" ON)
+option ( FTDIPP "Build C++ binding library libftdi1++" ON )
 
 # Targets
 set(cpp_sources   ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.cpp CACHE INTERNAL "List of cpp sources" )
@@ -9,82 +9,64 @@ set(cpp_headers   ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.hpp CACHE INTERNAL "List of c
         
 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(FTDI_BUILD_CPP True PARENT_SCOPE)
-        message(STATUS "Building libftdi1++")
-
-        # 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 2)
-
-        # Static library
-        if (STATICLIBS)
-            add_library(ftdipp1-static STATIC ${cpp_sources})
-            set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
-        endif (STATICLIBS)
-
-        # 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)
-
-        # Dependencies
-        target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
-
-        # Install
-        if(${UNIX})
-            install( TARGETS ftdipp1
-                        LIBRARY DESTINATION lib${LIB_SUFFIX}
-                        COMPONENT sharedlibs
-                        )
-            if (STATICLIBS)
-                install( TARGETS ftdipp1-static
-                            ARCHIVE DESTINATION lib${LIB_SUFFIX}
-                            COMPONENT staticlibs
-                            )
-            endif (STATICLIBS)
-            install( FILES ${cpp_headers}
-                        DESTINATION include/${PROJECT_NAME}
-                        COMPONENT headers
-                        )
-        endif(${UNIX})
-
-        if(${WIN32})
-            install( TARGETS ftdipp1
-                        DESTINATION bin
-                        COMPONENT sharedlibs
-                        )
-            if (STATICLIBS)
-                install( TARGETS ftdipp1-static
-                            DESTINATION bin
-                            COMPONENT staticlibs
-                            )
-            endif (STATICLIBS)
-            install( FILES ${cpp_headers}
-                        DESTINATION include/${PROJECT_NAME}
-                        COMPONENT headers
-                        )
-        endif(${WIN32})
-
-    else(Boost_FOUND)
-        message(STATUS "Boost not found, won't build libftdi1++")
-    endif(Boost_FOUND)
-
-else(FTDIPP)
-
-    message(STATUS "Not building libftdi1++")
-
-endif(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(FTDI_BUILD_CPP True PARENT_SCOPE)
+    message(STATUS "Building libftdi1++")
+
+    # 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 2)
+
+    # Static library
+    if (STATICLIBS)
+        add_library(ftdipp1-static STATIC ${cpp_sources})
+        set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
+    endif (STATICLIBS)
+
+    # 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)
+
+    # Dependencies
+    target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
+
+    
+    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++")
+endif ()