summaryrefslogtreecommitdiffstats
path: root/libshiboken
diff options
context:
space:
mode:
Diffstat (limited to 'libshiboken')
-rw-r--r--libshiboken/CMakeLists.txt18
-rw-r--r--libshiboken/ShibokenConfig.cmake.in11
-rw-r--r--libshiboken/ShibokenConfigVersion.cmake.in9
-rw-r--r--libshiboken/shiboken.pc.in12
4 files changed, 2 insertions, 48 deletions
diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt
index a632b68a..bfd160b1 100644
--- a/libshiboken/CMakeLists.txt
+++ b/libshiboken/CMakeLists.txt
@@ -14,13 +14,6 @@ set(libshiboken_MICRO_VERSION ${shiboken_MICRO_VERSION})
set(libshiboken_VERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}.${libshiboken_MICRO_VERSION}")
set(libshiboken_SOVERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfigVersion.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake" @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken.pc.in"
- "${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc" @ONLY)
-
set(libshiboken_SRC
basewrapper.cpp
gilstate.cpp
@@ -36,7 +29,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${SPARSEHASH_INCLUDE_PATH})
add_library(libshiboken SHARED ${libshiboken_SRC})
target_link_libraries(libshiboken ${SBK_PYTHON_LIBRARIES})
-set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken"
+set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken${shiboken_SUFFIX}"
VERSION ${libshiboken_VERSION}
SOVERSION ${libshiboken_SOVERSION}
DEFINE_SYMBOL LIBSHIBOKEN_EXPORTS)
@@ -55,15 +48,8 @@ install(FILES
shibokenmacros.h
threadstatesaver.h
typeresolver.h
- DESTINATION include/shiboken)
+ DESTINATION include/shiboken${shiboken_SUFFIX})
install(TARGETS libshiboken EXPORT shiboken
LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION bin)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake"
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${libshiboken_VERSION}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfigVersion.cmake"
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken-${libshiboken_VERSION}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken.pc"
- DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-
diff --git a/libshiboken/ShibokenConfig.cmake.in b/libshiboken/ShibokenConfig.cmake.in
deleted file mode 100644
index da513be0..00000000
--- a/libshiboken/ShibokenConfig.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN
-# SHIBOKEN_LIBRARIES - Files to link against to use SHIBOKEN
-
-SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken")
-if(MSVC)
- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken.lib")
-elseif(WIN32)
- SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@CMAKE_SHARED_LIBRARY_SUFFIX@")
-else()
- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@CMAKE_SHARED_LIBRARY_SUFFIX@")
-endif()
diff --git a/libshiboken/ShibokenConfigVersion.cmake.in b/libshiboken/ShibokenConfigVersion.cmake.in
deleted file mode 100644
index c29b249d..00000000
--- a/libshiboken/ShibokenConfigVersion.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-set(PACKAGE_VERSION @libshiboken_VERSION@)
-if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @libshiboken_MAJOR_VERSION@)
- if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @libshiboken_MINOR_VERSION@)
- set(PACKAGE_VERSION_COMPATIBLE 1)
- if("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @libshiboken_MICRO_VERSION@)
- set(PACKAGE_VERSION_EXACT 1)
- endif()
- endif()
-endif()
diff --git a/libshiboken/shiboken.pc.in b/libshiboken/shiboken.pc.in
deleted file mode 100644
index c188831d..00000000
--- a/libshiboken/shiboken.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
-generator_location=@CMAKE_INSTALL_PREFIX@/bin/shiboken
-
-Name: shiboken
-Description: Support library for Python bindings created with Shiboken generator.
-Version: @libshiboken_VERSION@
-Libs: -L${libdir} -lpython
-Cflags: -I${includedir}
-