Skip to content
Snippets Groups Projects
Commit 8020f724 authored by unknown's avatar unknown
Browse files

more mingw build/install fixes

parent 0c62e4eb
Branches
No related merge requests found
...@@ -21,7 +21,6 @@ add_executable( tagset-tool tagset-tool.cpp ) ...@@ -21,7 +21,6 @@ add_executable( tagset-tool tagset-tool.cpp )
add_executable( corpus2get corpus2get.cpp ) add_executable( corpus2get corpus2get.cpp )
target_link_libraries ( tagset-tool corpus2 pwrutils ${Boost_LIBRARIES} ${LIBS}) target_link_libraries ( tagset-tool corpus2 pwrutils ${Boost_LIBRARIES} ${LIBS})
target_link_libraries ( corpus2get corpus2 pwrutils ${Boost_LIBRARIES} ${LIBS}) target_link_libraries ( corpus2get corpus2 pwrutils ${Boost_LIBRARIES} ${LIBS})
if(UNIX)
install(TARGETS tagset-tool corpus2get install(TARGETS tagset-tool corpus2get
RUNTIME DESTINATION bin) RUNTIME DESTINATION bin)
...@@ -29,4 +28,3 @@ if(UNIX) ...@@ -29,4 +28,3 @@ if(UNIX)
DESTINATION bin DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif(UNIX)
...@@ -99,8 +99,8 @@ set_target_properties(corpus2 PROPERTIES ...@@ -99,8 +99,8 @@ set_target_properties(corpus2 PROPERTIES
VERSION "${corpus2_ver_major}.${corpus2_ver_minor}" VERSION "${corpus2_ver_major}.${corpus2_ver_minor}"
SOVERSION ${corpus2_ver_major}) SOVERSION ${corpus2_ver_major})
if(UNIX)
install(TARGETS corpus2 install(TARGETS corpus2
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib) LIBRARY DESTINATION lib)
install( install(
...@@ -126,5 +126,4 @@ if(UNIX) ...@@ -126,5 +126,4 @@ if(UNIX)
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "local/*" EXCLUDE PATTERN "local/*" EXCLUDE
) )
endif(UNIX)
...@@ -52,8 +52,8 @@ set_target_properties(pwrutils PROPERTIES ...@@ -52,8 +52,8 @@ set_target_properties(pwrutils PROPERTIES
VERSION "${pwrutils_ver_major}.${pwrutils_ver_minor}" VERSION "${pwrutils_ver_major}.${pwrutils_ver_minor}"
SOVERSION ${pwrutils_ver_major}) SOVERSION ${pwrutils_ver_major})
if(UNIX)
install(TARGETS pwrutils install(TARGETS pwrutils
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib) LIBRARY DESTINATION lib)
install( install(
...@@ -70,5 +70,4 @@ if(UNIX) ...@@ -70,5 +70,4 @@ if(UNIX)
DESTINATION include DESTINATION include
FILES_MATCHING PATTERN "version.h" FILES_MATCHING PATTERN "version.h"
) )
endif(UNIX)
...@@ -105,8 +105,8 @@ install( ...@@ -105,8 +105,8 @@ install(
# Install SWIG files # Install SWIG files
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
install( #install(
FILES ${I_FILES} # FILES ${I_FILES}
DESTINATION ${SWIG_SRC_DIR} # DESTINATION ${SWIG_SRC_DIR}
PERMISSIONS ${PERM_SCRIPTS} # PERMISSIONS ${PERM_SCRIPTS}
) #)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment