From 8020f724875d142d23936ea7c6050457776c4f8a Mon Sep 17 00:00:00 2001
From: unknown <bOBaN@bOBaN-desktop.(none)>
Date: Tue, 25 Sep 2012 19:31:33 +0200
Subject: [PATCH] more mingw build/install fixes
---
corpus2tools/CMakeLists.txt | 2 --
libcorpus2/CMakeLists.txt | 3 +--
libpwrutils/CMakeLists.txt | 3 +--
swig/CMakeLists.txt | 10 +++++-----
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/corpus2tools/CMakeLists.txt b/corpus2tools/CMakeLists.txt
index 1be6155..968efbc 100644
--- a/corpus2tools/CMakeLists.txt
+++ b/corpus2tools/CMakeLists.txt
@@ -21,7 +21,6 @@ add_executable( tagset-tool tagset-tool.cpp )
add_executable( corpus2get corpus2get.cpp )
target_link_libraries ( tagset-tool corpus2 pwrutils ${Boost_LIBRARIES} ${LIBS})
target_link_libraries ( corpus2get corpus2 pwrutils ${Boost_LIBRARIES} ${LIBS})
-if(UNIX)
install(TARGETS tagset-tool corpus2get
RUNTIME DESTINATION bin)
@@ -29,4 +28,3 @@ if(UNIX)
DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-endif(UNIX)
diff --git a/libcorpus2/CMakeLists.txt b/libcorpus2/CMakeLists.txt
index fc5dc98..e1e6637 100644
--- a/libcorpus2/CMakeLists.txt
+++ b/libcorpus2/CMakeLists.txt
@@ -99,8 +99,8 @@ set_target_properties(corpus2 PROPERTIES
VERSION "${corpus2_ver_major}.${corpus2_ver_minor}"
SOVERSION ${corpus2_ver_major})
-if(UNIX)
install(TARGETS corpus2
+ ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib)
install(
@@ -126,5 +126,4 @@ if(UNIX)
PATTERN ".svn" EXCLUDE
PATTERN "local/*" EXCLUDE
)
-endif(UNIX)
diff --git a/libpwrutils/CMakeLists.txt b/libpwrutils/CMakeLists.txt
index 30c8042..68c55e9 100644
--- a/libpwrutils/CMakeLists.txt
+++ b/libpwrutils/CMakeLists.txt
@@ -52,8 +52,8 @@ set_target_properties(pwrutils PROPERTIES
VERSION "${pwrutils_ver_major}.${pwrutils_ver_minor}"
SOVERSION ${pwrutils_ver_major})
-if(UNIX)
install(TARGETS pwrutils
+ ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib)
install(
@@ -70,5 +70,4 @@ if(UNIX)
DESTINATION include
FILES_MATCHING PATTERN "version.h"
)
-endif(UNIX)
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 953425b..0db5365 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -105,8 +105,8 @@ install(
# Install SWIG files
# -----------------------------------------------------------------------------
-install(
- FILES ${I_FILES}
- DESTINATION ${SWIG_SRC_DIR}
- PERMISSIONS ${PERM_SCRIPTS}
-)
+#install(
+# FILES ${I_FILES}
+# DESTINATION ${SWIG_SRC_DIR}
+# PERMISSIONS ${PERM_SCRIPTS}
+#)
--
GitLab