Fixing compilation with -DBUILD_SHARED_LIBS=ON

Libraries under libs should be forced STATIC since there circular
dependencies and implicit linking with external libraries. Otherwise
compilation will fails with underlinking errors.

diff --git a/libs/cmdlib/CMakeLists.txt b/libs/cmdlib/CMakeLists.txt
index 5d25ce82844a50f02b4b9b595c238525f2fab428..b8c48b0112bc541fc5cd06180a59574eb8236afa 100644 (file)
--- a/libs/cmdlib/CMakeLists.txt
+++ b/libs/cmdlib/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(cmdlib
+add_library(cmdlib STATIC
         cmdlib.cpp ../cmdlib.h
         )

diff --git a/libs/container/CMakeLists.txt b/libs/container/CMakeLists.txt
index 00bfbb4a6bc14bf96fef5744432409da6ae54dee..028129ba4b5bdaf21f94147a21ee6278ba523fd2 100644 (file)
--- a/libs/container/CMakeLists.txt
+++ b/libs/container/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(container
+add_library(container STATIC
         array.cpp array.h
         cache.h
         container.h

diff --git a/libs/crnrgba/CMakeLists.txt b/libs/crnrgba/CMakeLists.txt
index 6e8463dc6668f0a326a4c2fb76b5dc847d2e31e3..a5ec18e3ff7b24be50eea30efddb756b3023c8d1 100644 (file)
--- a/libs/crnrgba/CMakeLists.txt
+++ b/libs/crnrgba/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(crnrgba
+add_library(crnrgba STATIC
         crn_rgba.h
         crn_rgba.cpp
         ../crunch/inc/crn_decomp.h

diff --git a/libs/ddslib/CMakeLists.txt b/libs/ddslib/CMakeLists.txt
index d4de1a7c80b859004577c85b28659b4cdc518a8c..a45ccc7f232151fab0acac7cd96c5fb0d8535e66 100644 (file)
--- a/libs/ddslib/CMakeLists.txt
+++ b/libs/ddslib/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(ddslib
+add_library(ddslib STATIC
         ddslib.c ../ddslib.h
         )

diff --git a/libs/debugging/CMakeLists.txt b/libs/debugging/CMakeLists.txt
index e5880de39e33224d5ecca16d834b214e5c873881..0b8f90d83bbfa7745ff8aca17f416362cbf290d7 100644 (file)
--- a/libs/debugging/CMakeLists.txt
+++ b/libs/debugging/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(debugging
+add_library(debugging STATIC
         debugging.cpp debugging.h
         )

diff --git a/libs/etclib/CMakeLists.txt b/libs/etclib/CMakeLists.txt
index 8d8fb23a361f1d867242b95e5f0ad2c0b1f19ef8..68a12302d342488201c81e9e368790245e31a5ac 100644 (file)
--- a/libs/etclib/CMakeLists.txt
+++ b/libs/etclib/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(etclib
+add_library(etclib STATIC
         ../etclib.c ../etclib.h
         )

diff --git a/libs/filematch/CMakeLists.txt b/libs/filematch/CMakeLists.txt
index c7d8a9edb00acc70731c0bfab540c1d2b3713ee0..fede3eb59d3c713758893ea7afc64f26cd76b130 100644 (file)
--- a/libs/filematch/CMakeLists.txt
+++ b/libs/filematch/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(filematch
+add_library(filematch STATIC
         ../filematch.c ../filematch.h
         )

diff --git a/libs/generic/CMakeLists.txt b/libs/generic/CMakeLists.txt
index d89f57438b40966d7ce6a41003a3b4a27196f30a..e05637efb6e8ea6c69b9d37ac7cf664ec18bfc9c 100644 (file)
--- a/libs/generic/CMakeLists.txt
+++ b/libs/generic/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(generic
+add_library(generic STATIC
         arrayrange.h
         bitfield.h
         callback.cpp callback.h

diff --git a/libs/gtkutil/CMakeLists.txt b/libs/gtkutil/CMakeLists.txt
index b62098c107940d18c233c6470ecb52a81d640eb7..80eca88c62457f699f813b1d7cce4f00b93a0366 100644 (file)
--- a/libs/gtkutil/CMakeLists.txt
+++ b/libs/gtkutil/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(gtkutil
+add_library(gtkutil STATIC
         accelerator.cpp accelerator.h
         button.cpp button.h
         clipboard.cpp clipboard.h

diff --git a/libs/l_net/CMakeLists.txt b/libs/l_net/CMakeLists.txt
index a0a19a843846403b010f218f51dd204fe8052b77..c4984b83f3b57cfd7b5d2f37e6c7b139eaab23bb 100644 (file)
--- a/libs/l_net/CMakeLists.txt
+++ b/libs/l_net/CMakeLists.txt
@@ -7,7 +7,7 @@ else ()
     list(APPEND L_NETLIST l_net_berkley.c)
 endif ()
 
-add_library(l_net ${L_NETLIST})
+add_library(l_net STATIC ${L_NETLIST})
 
 if (WIN32)
     target_link_libraries(l_net PRIVATE ws2_32)

diff --git a/libs/math/CMakeLists.txt b/libs/math/CMakeLists.txt
index 6cfedbefb42c17da3bdbb60372f75152536607e3..4dc8a8ce6cc5bab123a8fb2fcc4863ff0bd33031 100644 (file)
--- a/libs/math/CMakeLists.txt
+++ b/libs/math/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(math
+add_library(math STATIC
         _.cpp
         aabb.h
         curve.h

diff --git a/libs/mathlib/CMakeLists.txt b/libs/mathlib/CMakeLists.txt
index 5682a5e1d68c8dec76fec7f782184046fcd5b9bb..27b087a85f85868865901c0fd656247b0f447a51 100644 (file)
--- a/libs/mathlib/CMakeLists.txt
+++ b/libs/mathlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(mathlib
+add_library(mathlib STATIC
         bbox.c
         line.c
         m4x4.c

diff --git a/libs/memory/CMakeLists.txt b/libs/memory/CMakeLists.txt
index 1c345734254cd749c6944f9bf045a15a31e1a08e..bebfc22db008d76a542f64568d42bc63f35044e2 100644 (file)
--- a/libs/memory/CMakeLists.txt
+++ b/libs/memory/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(memory
+add_library(memory STATIC
         allocator.cpp allocator.h
         )

diff --git a/libs/modulesystem/CMakeLists.txt b/libs/modulesystem/CMakeLists.txt
index d27aa63382d260df34c63902bf658916956611fa..489ee4a5be423b841341854617ff0b7c4d9a1d75 100644 (file)
--- a/libs/modulesystem/CMakeLists.txt
+++ b/libs/modulesystem/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(modulesystem
+add_library(modulesystem STATIC
         moduleregistry.h
         modulesmap.h
         singletonmodule.cpp singletonmodule.h

diff --git a/libs/os/CMakeLists.txt b/libs/os/CMakeLists.txt
index 437b506caff6c7fc78251a80af0b1acdd5f61f5c..a1e475998e10b3eac6e2af3aeb7cbc56dee10cc2 100644 (file)
--- a/libs/os/CMakeLists.txt
+++ b/libs/os/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(os
+add_library(os STATIC
         _.cpp
         dir.h
         file.h

diff --git a/libs/picomodel/CMakeLists.txt b/libs/picomodel/CMakeLists.txt
index 0f1286d0fb4056fe4349408135471de1bf9b7d76..4800fb46af957ba1704a71bdae0ae60990c6c3b4 100644 (file)
--- a/libs/picomodel/CMakeLists.txt
+++ b/libs/picomodel/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(picomodel
+add_library(picomodel STATIC
         lwo/clip.c
         lwo/envelope.c
         lwo/list.c

diff --git a/libs/profile/CMakeLists.txt b/libs/profile/CMakeLists.txt
index e3822f42283cccb147141ad4ba008b7c4211bf59..745238f3e3f6fc3b8e5f3135d066caf98147f693 100644 (file)
--- a/libs/profile/CMakeLists.txt
+++ b/libs/profile/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(profile
+add_library(profile STATIC
         file.cpp file.h
         profile.cpp profile.h
         )

diff --git a/libs/script/CMakeLists.txt b/libs/script/CMakeLists.txt
index 6e49527df0766e53fe87b3bddc694067ecb5c91d..0adfd1246803e20b3a8bc51a0e8e1bffb4ed99b4 100644 (file)
--- a/libs/script/CMakeLists.txt
+++ b/libs/script/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(script
+add_library(script STATIC
         _.cpp
         scripttokeniser.h
         scripttokenwriter.h

diff --git a/libs/signal/CMakeLists.txt b/libs/signal/CMakeLists.txt
index 499a483805ab3e86e8cf20af65addc7b9463e28b..026c7249f735047163b9528b3ec2c4169b2996a4 100644 (file)
--- a/libs/signal/CMakeLists.txt
+++ b/libs/signal/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(signal
+add_library(signal STATIC
         isignal.h
         signal.cpp signal.h
         signalfwd.h

diff --git a/libs/splines/CMakeLists.txt b/libs/splines/CMakeLists.txt
index 3a6b603d8fe7d4aa97a835483bd1281d4c49e637..d301f272b56abeb22b271129a390090fd5403dd4 100644 (file)
--- a/libs/splines/CMakeLists.txt
+++ b/libs/splines/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(splines
+add_library(splines STATIC
         math_angles.cpp math_angles.h
         math_matrix.cpp math_matrix.h
         math_quaternion.cpp math_quaternion.h

diff --git a/libs/stream/CMakeLists.txt b/libs/stream/CMakeLists.txt
index 6ce79395bbb02937f8eab135bab9a1ab38f10738..ec1c9ae94751ac005dcf400eb2ce42efd9d223a7 100644 (file)
--- a/libs/stream/CMakeLists.txt
+++ b/libs/stream/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(stream
+add_library(stream STATIC
         _.cpp
         filestream.h
         memstream.h

diff --git a/libs/string/CMakeLists.txt b/libs/string/CMakeLists.txt
index 4b0720a50e6891d4908b38c601794356e4c0fe93..a9c2f471a8fda5635dbaf88de546e5df76324509 100644 (file)
--- a/libs/string/CMakeLists.txt
+++ b/libs/string/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(string
+add_library(string STATIC
         pooledstring.cpp pooledstring.h
         string.h
         stringfwd.h

diff --git a/libs/uilib/CMakeLists.txt b/libs/uilib/CMakeLists.txt
index 080376b1b665dad1aee7f06f78e363efdce743b6..cfa957584d4d0b7ac844362de61d87e6c694a1bc 100644 (file)
--- a/libs/uilib/CMakeLists.txt
+++ b/libs/uilib/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(uilib
+add_library(uilib STATIC
         uilib.cpp
         )
 

diff --git a/libs/xml/CMakeLists.txt b/libs/xml/CMakeLists.txt
index 96e1e216fe43971c4a656d3794e9c27e287a3ff0..cd0b040af7bd1ce239089e0173beefbff5302dce 100644 (file)
--- a/libs/xml/CMakeLists.txt
+++ b/libs/xml/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(xmllib
+add_library(xmllib STATIC
         ixml.h
         xmlelement.h
         xmlparser.h