gameServer/CMakeLists.txt
changeset 13296 31615a2e0db1
parent 11860 ad435d95ca4b
child 13297 e9caada3aac1
--- a/gameServer/CMakeLists.txt	Wed Mar 28 14:06:34 2018 +0200
+++ b/gameServer/CMakeLists.txt	Wed Mar 28 15:14:20 2018 +0200
@@ -3,27 +3,25 @@
 
 find_package_or_disable(GHC NOSERVER)
 
-include(${CMAKE_MODULE_PATH}/CheckHaskellModuleExists.cmake)
+include(${CMAKE_MODULE_PATH}/CheckHaskellPackageExists.cmake)
 
-check_haskell_module_exists("Control.Exception" mask 1 base)
-check_haskell_module_exists("Data.Map" size 1 containers)
-check_haskell_module_exists("Data.Vector" length 1 vector)
-check_haskell_module_exists("Data.ByteString" pack 1 bytestring)
-check_haskell_module_exists("Network.BSD" getHostName 0 network)
-check_haskell_module_exists("Data.Time" getCurrentTime 0 time)
-check_haskell_module_exists("Control.Monad.State" fix 1 mtl)
-check_haskell_module_exists("Codec.Binary.Base64" encode 1 sandi)
-check_haskell_module_exists("System.Log.Logger" warningM 1 hslogger)
-check_haskell_module_exists("System.Process" createProcess 3 process)
-check_haskell_module_exists("Data.ByteString.Lazy.UTF8" decode 1 utf8-string)
-check_haskell_module_exists("Data.Digest.Pure.SHA" sha1 1 SHA)
-check_haskell_module_exists("System.Entropy" openHandle 0 entropy)
-check_haskell_module_exists("Codec.Compression.Zlib" decompress 1 zlib)
-check_haskell_module_exists("System.Random" getStdGen 0 random)
-check_haskell_module_exists("Text.Regex.TDFA.ByteString" execute 2 regex-tdfa)
-
-# this one needs type signatures to work
-# check_haskell_module_exists("Control.DeepSeq" deepseq 2 deepseq)
+check_haskell_package_exists(base "Control.Exception" mask 1)
+check_haskell_package_exists(containers "Data.Map" size 1)
+check_haskell_package_exists(vector "Data.Vector" length 1)
+check_haskell_package_exists(bytestring "Data.ByteString" pack 1)
+check_haskell_package_exists(network "Network.BSD" getHostName 0)
+check_haskell_package_exists(time "Data.Time" getCurrentTime 0)
+check_haskell_package_exists(mtl "Control.Monad.State" fix 1)
+check_haskell_package_exists(sandi "Codec.Binary.Base64" encode 1)
+check_haskell_package_exists(hslogger "System.Log.Logger" warningM 1)
+check_haskell_package_exists(process "System.Process" createProcess 3)
+check_haskell_package_exists(utf8-string "Data.ByteString.Lazy.UTF8" decode 1)
+check_haskell_package_exists(SHA "Data.Digest.Pure.SHA" sha1 1)
+check_haskell_package_exists(entropy "System.Entropy" openHandle 0)
+check_haskell_package_exists(zlib "Codec.Compression.Zlib" decompress 1)
+check_haskell_package_exists(random "System.Random" getStdGen 0)
+check_haskell_package_exists(regex-tdfa "Text.Regex.TDFA.ByteString" execute 2)
+check_haskell_package_exists(deepseq "Control.DeepSeq" deepseq 2)