[libsigcplusplus/cmake-integration] cmake: fix library name



commit 4b63f8c09891c21caae0f5fe302ab7f878043f08
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sat Mar 12 17:57:50 2016 +0100

    cmake: fix library name

 CMakeLists.txt          |    8 ++++----
 examples/CMakeLists.txt |    2 +-
 sigc++/CMakeLists.txt   |    2 +-
 tests/CMakeLists.txt    |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91050f3..5d63411 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,14 +26,14 @@ set (LIBSIGCPP_SOVERSION 0)
 
 option (SIGCXX_DISABLE_DEPRECATED "Disable deprecated" OFF)
 
-project (libsigc++)
+project (sigc++)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
 
-set (PROJECT_SOURCE_DIR "${libsigc++_SOURCE_DIR}/sigc++")
+set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++")
 
-include_directories (${libsigc++_SOURCE_DIR})
-include_directories (${libsigc++_BINARY_DIR})
+include_directories (${sigc++_SOURCE_DIR})
+include_directories (${sigc++_BINARY_DIR})
 
 configure_file (sigc++config.h.cmake sigc++config.h)
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e888e24..a983090 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -17,7 +17,7 @@
 function (add_sigcpp_example EXAMPLE_SOURCE_FILE)
        get_filename_component (example_name ${EXAMPLE_SOURCE_FILE} NAME_WE)
        add_executable (${example_name} ${EXAMPLE_SOURCE_FILE})
-       target_link_libraries (${example_name} ${PROJECT_NAME}-${SIGCXX_API_VERSION})
+       target_link_libraries (${example_name} sigc-${SIGCXX_API_VERSION})
 endfunction (add_sigcpp_example)
 
 add_sigcpp_example (hello_world.cc)
diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
index d192936..5d3945e 100644
--- a/sigc++/CMakeLists.txt
+++ b/sigc++/CMakeLists.txt
@@ -42,7 +42,7 @@ install (
        DIRECTORY       
                "${PROJECT_SOURCE_DIR}"
        DESTINATION
-               "include/sigc++-${SIGCXX_API_VERSION}"
+               "include/${PROJECT_NAME}-${SIGCXX_API_VERSION}"
                        FILES_MATCHING PATTERN
                "*.h"
 )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 89c6111..e91ffaf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ enable_testing ()
 function (add_sigcpp_test TEST_SOURCE_FILE)
        get_filename_component (test_name ${TEST_SOURCE_FILE} NAME_WE)
        add_executable (${test_name} ${TEST_SOURCE_FILE} testutilities.cc)
-       target_link_libraries (${test_name} ${PROJECT_NAME}-${SIGCXX_API_VERSION})
+       target_link_libraries (${test_name} sigc-${SIGCXX_API_VERSION})
        add_test (${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${test_name})
 endfunction (add_sigcpp_test)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]