Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-games/StormLib] version bump, converted to cmake-multilib, also still lacks static-libs support despite existence of useflag

Browse Source
This commit is contained in:
Robert Förster
2013-11-13 17:06:15 +01:00
parent b026612d88
commit 1d90209677
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev-games/StormLib/files/StormLib-multilib.patch
View File

@@ -1,15 +1,15 @@
--- CMakeLists.txt.old 2012-01-02 09:32:42.000000000 +0100
+++ CMakeLists.txt 2012-05-05 00:42:28.000000000 +0200
@@ -237,6 +237,8 @@
test/Test.cpp
)
--- CMakeLists.txt.old 2013-11-12 18:53:57.930000000 +0100
+++ CMakeLists.txt 2013-11-12 18:57:20.700000000 +0100
@@ -281,7 +281,7 @@
add_library(storm_static STATIC ${SRC_FILES} ${SRC_ADDITIONAL_FILES})
target_link_libraries(storm_static ${LINK_LIBS})
set_target_properties(storm_static PROPERTIES OUTPUT_NAME storm)
- install(TARGETS storm_static RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib FRAMEWORK DESTINATION /Library/Frameworks)
+ install(TARGETS storm_static RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} FRAMEWORK DESTINATION /Library/Frameworks)
endif()
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+
add_definitions(-D_7ZIP_ST -DBZ_STRICT_ANSI)
if(WIN32)
@@ -290,6 +292,6 @@
if(APPLE)
@@ -300,6 +300,6 @@
set_target_properties(storm PROPERTIES OUTPUT_NAME StormLib)
endif()