- update KviOsInfo with values from the winsdk8

- rip out some append libs statements for ws2_32; since we are linking in a way they get added anyway we don't need them (yet)
- remove wsock32.lib from kvilib, linking works fine without it
- move shlwapi for mingw from root to src/kvirc since that is where the msvc one is and it works
- remove envvar hack added in r6273 from perlcore since it is unneeded

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6276 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 1 insertions, 23 deletions

diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
index f45d3334c..8cbbf43a8 100644
--- a/src/modules/dcc/CMakeLists.txt
+++ b/src/modules/dcc/CMakeLists.txt
@@ -30,10 +30,6 @@ set(files
 	kvi_dccfiletransfericons.png
 )
 
-if(MINGW)
-	list(APPEND LIBS -lws2_32)
-endif(MINGW)
-
 set(kvi_module_name kvidcc)
 include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
 
diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt
index 369d4a617..40192c30e 100644
--- a/src/modules/ident/CMakeLists.txt
+++ b/src/modules/ident/CMakeLists.txt
@@ -4,9 +4,5 @@ set(kviident_SRCS
 	libkviident.cpp
 )
 
-if(MINGW)
-	list(APPEND LIBS -lws2_32)
-endif(MINGW)
-
 set(kvi_module_name kviident)
 include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 7d8625372..ee0c7a950 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -1,14 +1,5 @@
 # CMakeLists for src/modules/objects
 
-# From qmake
-#QT += xml
-
-if(MINGW)
-	list(APPEND LIBS -lws2_32)
-endif(MINGW)
-
-
-
 set(kviobjects_SRCS
 	libkviobjects.cpp
 	KvsObject_button.cpp
diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt
index 56403fa8a..cf8031e24 100644
--- a/src/modules/perlcore/CMakeLists.txt
+++ b/src/modules/perlcore/CMakeLists.txt
@@ -7,11 +7,6 @@ set(kviperlcore_SRCS
 set(kvi_module_name kviperlcore)
 
 if(COMPILE_PERL_SUPPORT)
-	if(WIN32)
-		# Activestates perl is too chatty for us
-		set( ENV{ACTIVEPERL_CONFIG_SILENT} 1 )
-	endif()
-	
 	# Get compile flags
 	execute_process(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts
 		OUTPUT_VARIABLE PERL_COMPILE_FLAGS
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt
index 32f63246d..04f55152b 100644
--- a/src/modules/setup/CMakeLists.txt
+++ b/src/modules/setup/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 if(MINGW)
 	list(APPEND LIBS -lole32 -luuid)
-endif(MINGW)
+endif()