From 07bcd6fba87873cec2fafe788d64fc664563f7db Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 22 Jan 2016 08:41:24 +0000
Subject: [PATCH] Removed obsolete linking to winmm.
---
SimpleTests/MatrixTests/CMakeLists.txt | 9 ---------
SimpleTests/MeshTests/CMakeLists.txt | 6 ------
SimpleTests/SolverTests/CMakeLists.txt | 4 ----
3 files changed, 19 deletions(-)
diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index 2d9fb5b6ead..46b7b4260f4 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/SimpleTests/MatrixTests/CMakeLists.txt
@@ -1,8 +1,3 @@
-## pthread ##
-if(WIN32)
- set(ADDITIONAL_LIBS Winmm.lib)
-endif()
-
if(CMAKE_USE_PTHREADS_INIT)
set(HAVE_PTHREADS TRUE)
endif()
@@ -36,7 +31,6 @@ target_link_libraries(MatMult
logog
BaseLib
MathLib
- ${ADDITIONAL_LIBS}
)
add_executable(MatTestRemoveRowsCols
@@ -48,7 +42,6 @@ set_target_properties(MatTestRemoveRowsCols PROPERTIES FOLDER SimpleTests)
target_link_libraries(MatTestRemoveRowsCols
BaseLib
MathLib
- ${ADDITIONAL_LIBS}
)
if(METIS_FOUND)
@@ -64,7 +57,6 @@ if(METIS_FOUND)
MathLib
logog
${METIS_LIBRARIES}
- ${ADDITIONAL_LIBS}
)
if(OPENMP_FOUND)
@@ -80,7 +72,6 @@ if(METIS_FOUND)
MathLib
logog
${METIS_LIBRARIES}
- ${ADDITIONAL_LIBS}
)
endif()
endif()
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 75680d32c02..1610e782ba2 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -1,7 +1,3 @@
-if(WIN32)
- set(ADDITIONAL_LIBS Winmm.lib)
-endif()
-
# Create the executable
add_executable(MeshRead
MeshRead.cpp
@@ -16,7 +12,6 @@ target_link_libraries(MeshRead
BaseLib
GeoLib
logog
- ${ADDITIONAL_LIBS}
${BOOST_LIBRARIES}
)
@@ -34,6 +29,5 @@ target_link_libraries(MeshSearchTest
BaseLib
GeoLib
logog
- ${ADDITIONAL_LIBS}
${BOOST_LIBRARIES}
)
diff --git a/SimpleTests/SolverTests/CMakeLists.txt b/SimpleTests/SolverTests/CMakeLists.txt
index 64fbd047241..cec6cda30aa 100644
--- a/SimpleTests/SolverTests/CMakeLists.txt
+++ b/SimpleTests/SolverTests/CMakeLists.txt
@@ -1,7 +1,3 @@
-if(WIN32)
- set(ADDITIONAL_LIBS Winmm.lib)
-endif()
-
add_executable(ConjugateGradientUnpreconditioned
ConjugateGradientUnpreconditioned.cpp
${SOURCES}
--
GitLab