[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [smokegen/KDE/4.10] cmake: we really want lib and not bin even on win32
From: Arno Rehn <arno () arnorehn ! de>
Date: 2013-06-10 11:25:46
Message-ID: 20130610112546.4118EA605A () git ! kde ! org
[Download RAW message or body]
Git commit f644c803293d131ec23c6b26501eb1d06025d0e4 by Arno Rehn, on behalf=
of David Lechner.
Committed on 28/02/2013 at 00:01.
Pushed by arnorehn into branch 'KDE/4.10'.
we really want lib and not bin even on win32
M +7 -15 cmake/SmokeConfig.cmake.in
http://commits.kde.org/smokegen/f644c803293d131ec23c6b26501eb1d06025d0e4
diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
index 947315c..48316b6 100644
--- a/cmake/SmokeConfig.cmake.in
+++ b/cmake/SmokeConfig.cmake.in
@@ -34,7 +34,7 @@ endfunction (_print type message)
=
##############################
# find individual smoke libs #
-##############################Smoke_FIND_REQUIRED
+##############################
=
macro (find_smoke_component name)
string(TOUPPER ${name} uppercase)
@@ -46,20 +46,12 @@ macro (find_smoke_component name)
find_path(SMOKE_${uppercase}_INCLUDE_DIR =
${lowercase}_smoke.h =
PATH ${SMOKE_INCLUDE_DIR}
- NO_DEFAULT_PATH
- )
- if(WIN32)
- # DLLs are in the bin directory.
- find_library(SMOKE_${uppercase}_LIBRARY
- smoke${lowercase}
- PATHS "@CMAKE_INSTALL_PREFIX@/bin"
- NO_DEFAULT_PATH)
- else(WIN32)
- find_library(SMOKE_${uppercase}_LIBRARY
- smoke${lowercase}
- PATHS "@SMOKE_LIBRARY_PREFIX@"
- NO_DEFAULT_PATH)
- endif(WIN32)
+ NO_DEFAULT_PATH)
+
+ find_library(SMOKE_${uppercase}_LIBRARY
+ smoke${lowercase}
+ PATHS "@SMOKE_LIBRARY_PREFIX@"
+ NO_DEFAULT_PATH)
=
if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_L=
IBRARY)
if (Smoke_FIND_REQUIRED)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic