mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-26 14:04:52 +00:00
fixed a patch which was rejected, i wonder why it was still there...
This commit is contained in:
parent
6b1116cfce
commit
d7dc9cd0d2
@ -1,46 +1,13 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
|
||||||
index 79945c4..a244d0f 100644
|
--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000
|
||||||
--- a/CMakeLists.txt
|
+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000
|
||||||
+++ b/CMakeLists.txt
|
@@ -80,8 +80,7 @@
|
||||||
@@ -32,10 +32,6 @@ set(generator_SRC
|
set(SMOKE_API_BIN "@SMOKE_API_BIN@")
|
||||||
type.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
-# force RPATH so that the binary is usable from within the build tree
|
find_library(SMOKE_BASE_LIBRARY smokebase
|
||||||
-set (CMAKE_SKIP_BUILD_RPATH FALSE)
|
- PATHS "@SMOKE_LIBRARY_PREFIX@"
|
||||||
-set (CMAKE_SKIP_RPATH FALSE)
|
- NO_DEFAULT_PATH)
|
||||||
-
|
+ PATHS "@SMOKE_LIBRARY_PREFIX@")
|
||||||
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
|
|
||||||
|
|
||||||
add_executable(smokegen ${generator_SRC})
|
if (NOT SMOKE_BASE_LIBRARY)
|
||||||
diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
|
if (Smoke_FIND_REQUIRED)
|
||||||
index 947315c..de8d66c 100644
|
|
||||||
--- a/cmake/SmokeConfig.cmake.in
|
|
||||||
+++ b/cmake/SmokeConfig.cmake.in
|
|
||||||
@@ -44,21 +44,19 @@ macro (find_smoke_component name)
|
|
||||||
set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
|
|
||||||
|
|
||||||
find_path(SMOKE_${uppercase}_INCLUDE_DIR
|
|
||||||
- ${lowercase}_smoke.h
|
|
||||||
- PATH ${SMOKE_INCLUDE_DIR}
|
|
||||||
- NO_DEFAULT_PATH
|
|
||||||
+ ${lowercase}_smoke.h
|
|
||||||
+ HINTS ${SMOKE_INCLUDE_DIR}
|
|
||||||
+ PATH_SUFFIXES smoke
|
|
||||||
)
|
|
||||||
if(WIN32)
|
|
||||||
# DLLs are in the bin directory.
|
|
||||||
find_library(SMOKE_${uppercase}_LIBRARY
|
|
||||||
smoke${lowercase}
|
|
||||||
- PATHS "@CMAKE_INSTALL_PREFIX@/bin"
|
|
||||||
- NO_DEFAULT_PATH)
|
|
||||||
+ PATHS "@CMAKE_INSTALL_PREFIX@/bin")
|
|
||||||
else(WIN32)
|
|
||||||
find_library(SMOKE_${uppercase}_LIBRARY
|
|
||||||
smoke${lowercase}
|
|
||||||
- PATHS "@SMOKE_LIBRARY_PREFIX@"
|
|
||||||
- NO_DEFAULT_PATH)
|
|
||||||
+ PATHS "@SMOKE_LIBRARY_PREFIX@")
|
|
||||||
endif(WIN32)
|
|
||||||
|
|
||||||
if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user