From: Stefan Huber Date: Tue, 12 Nov 2013 23:20:49 +0000 (+0100) Subject: Do not create dummy shared lib X-Git-Tag: v0.1~22 X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=a440a674daf0140dc0fed2c6ed84d0fe04790159;p=libstick.git Do not create dummy shared lib --- diff --git a/include/libstick-0.1/test.h b/include/libstick-0.1/test.h deleted file mode 100644 index e610c5a..0000000 --- a/include/libstick-0.1/test.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef test_h_yiQuuiphuilutieX -#define test_h_yiQuuiphuilutieX - -extern "C" void test(); - -#endif diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2d03559..5bd4f80 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,10 +1,9 @@ -set(stick_SRC test.cc) +#set(stick_SRC test.cc) -include_directories(${libstick_SOURCE_DIR}/include) +#include_directories(${libstick_SOURCE_DIR}/include) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libstick.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libstick.pc @ONLY) - -add_library(stick SHARED ${stick_SRC}) +#add_library(stick SHARED ${stick_SRC}) +#install(TARGETS stick DESTINATION lib) -install(TARGETS stick DESTINATION lib) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libstick.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libstick.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libstick.pc DESTINATION lib/pkgconfig COMPONENT "pkgconfig") diff --git a/lib/test.cc b/lib/test.cc deleted file mode 100644 index 75a9499..0000000 --- a/lib/test.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include - -#include "libstick-0.1/test.h" - - -void test() { - printf("Hello world.\n"); -} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2ef2b65..15fe760 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,5 +9,5 @@ include_directories(${libstick_SOURCE_DIR}/include) add_executable(tests ${tests_SRC}) target_link_libraries(tests - stick + #stick ${libcpptest_LIBRARIES})