Fix typo in error message

[libftdi] / ftdipp / CMakeLists.txt

diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index 43057ce..d3a22ce 100644 (file)
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -1,52 +1,61 @@
 # Check
 set(FTDI_BUILD_CPP False PARENT_SCOPE)
 
-option(FTDIPP "Build C++ binding library libftdi++" 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" )
+set(cpp_headers   ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.hpp CACHE INTERNAL "List of cpp headers" )
+        
 if (FTDIPP)
 
     if(Boost_FOUND)
 
         # Includes
-        include_directories(${Boost_INCLUDE_DIRS}
-                            ${CMAKE_CURRENT_BINARY_DIR}
+        include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
                             ${CMAKE_CURRENT_SOURCE_DIR}
-                            ${CMAKE_CURRENT_SOURCE_DIR}/../src)
+                            ${CMAKE_SOURCE_DIR}/src)
+
+        include_directories(${Boost_INCLUDE_DIRS})
+
 
-        # Targets
-        set(cpp_sources   ftdi.cpp)
-        set(cpp_headers   ftdi.hpp)
 
         set(FTDI_BUILD_CPP True PARENT_SCOPE)
-        message(STATUS "Building libftdi++")
+        message(STATUS "Building libftdi1++")
 
         # Shared library
-        add_library(ftdipp SHARED ${cpp_sources})
+        add_library(ftdipp1 SHARED ${cpp_sources})
 
         math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases
-        set_target_properties(ftdipp PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 1)
+        set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
 
         # Static library
-        add_library(ftdipp-static STATIC ${cpp_sources})
-        set_target_properties(ftdipp-static PROPERTIES OUTPUT_NAME "ftdipp")
+        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(ftdipp PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-        set_target_properties(ftdipp-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+        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(ftdipp ftdi ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
+        target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
 
         # Install
         if(${UNIX})
-            install( TARGETS ftdipp
+            install( TARGETS ftdipp1
                         LIBRARY DESTINATION lib${LIB_SUFFIX}
                         COMPONENT sharedlibs
                         )
-            install( TARGETS ftdipp-static
-                        ARCHIVE DESTINATION lib${LIB_SUFFIX}
-                        COMPONENT staticlibs
-                        )
+            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
@@ -54,14 +63,16 @@ if (FTDIPP)
         endif(${UNIX})
 
         if(${WIN32})
-            install( TARGETS ftdipp
+            install( TARGETS ftdipp1
                         DESTINATION bin
                         COMPONENT sharedlibs
                         )
-            install( TARGETS ftdipp-static
-                        DESTINATION bin
-                        COMPONENT staticlibs
-                        )
+            if (STATICLIBS)
+                install( TARGETS ftdipp1-static
+                            DESTINATION bin
+                            COMPONENT staticlibs
+                            )
+            endif (STATICLIBS)
             install( FILES ${cpp_headers}
                         DESTINATION include/${PROJECT_NAME}
                         COMPONENT headers
@@ -69,11 +80,11 @@ if (FTDIPP)
         endif(${WIN32})
 
     else(Boost_FOUND)
-        message(STATUS "Boost not found, won't build libftdi++")
+        message(STATUS "Boost not found, won't build libftdi1++")
     endif(Boost_FOUND)
 
 else(FTDIPP)
 
-    message(STATUS "Not building libftdi++")
+    message(STATUS "Not building libftdi1++")
 
 endif(FTDIPP)