Wrong include folders structure, missing DLL exports

retifrav · Jul 19, 2023 · b7efcfc · b7efcfc
1 parent a4f4c3e
commit b7efcfc
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 37 deletions.
diff --git a/dpndnc/CMakeLists.txt b/dpndnc/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(${PROJECT_NAME}
 
 # without it public headers won't get installed
 set(public_headers
-    include/thingy.h
+    include/Thingy/thingy.h
 )
 
 include(Installing)
diff --git a/dpndnc/include/Thingy/thingy.h b/dpndnc/include/Thingy/thingy.h
@@ -0,0 +1,29 @@
+#ifndef THINGY_H
+#define THINGY_H
+
+#ifdef Thingy_EXPORTS // CMake sets that when BUILD_SHARED_LIBS=1
+    #ifdef _MSC_VER // for MSVC
+        // export on compiling the DLL (when building)
+        #define DLLEXPORT __declspec(dllexport)
+    //#elif __GNUC__ >= 4 // for GCC
+    //    #define DLLEXPORT __attribute__ ((visibility("default")))
+    #endif // any other compilers require anything like that?
+#else
+    #ifdef _MSC_VER // for MSVC
+        // import on using the created DLL (when using in projects)
+        #define DLLEXPORT __declspec(dllimport)
+    //#elif __GNUC__ >= 4 // for GCC
+    //    // something here for GCC?
+    #endif // any other compilers require anything like that?
+#endif
+
+#ifndef DLLEXPORT
+    #define DLLEXPORT // so it doesn't fail being undefined
+#endif
+
+namespace dpndnc
+{
+    DLLEXPORT void doThingy();
+}
+
+#endif // THINGY_H
diff --git a/dpndnc/include/thingy.h b/dpndnc/include/thingy.h
diff --git a/dpndnc/src/thingy.cpp b/dpndnc/src/thingy.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include <Thingy/thingy.h>
 #include "stuff.h"
 
 namespace dpndnc

diff --git a/prjct/libraries/AnotherLibrary/CMakeLists.txt b/prjct/libraries/AnotherLibrary/CMakeLists.txt
@@ -62,7 +62,7 @@ endif()
 
 # without it public headers won't get installed
 set(public_headers
-    include/another.h
+    include/Another/another.h
 )
 
 # to guard against against undefined BUILD_SHARED_LIBS inside Config.cmake.in,

diff --git a/prjct/libraries/AnotherLibrary/include/Another/another.h b/prjct/libraries/AnotherLibrary/include/Another/another.h
@@ -0,0 +1,35 @@
+#ifndef ANOTHER_H
+#define ANOTHER_H
+
+#ifdef AnotherLibrary_EXPORTS // CMake sets that when BUILD_SHARED_LIBS=1
+    #ifdef _MSC_VER // for MSVC
+        // export on compiling the DLL (when building)
+        #define DLLEXPORT __declspec(dllexport)
+    //#elif __GNUC__ >= 4 // for GCC
+    //    #define DLLEXPORT __attribute__ ((visibility("default")))
+    #endif // any other compilers require anything like that?
+#else
+    #ifdef _MSC_VER // for MSVC
+        // import on using the created DLL (when using in projects)
+        #define DLLEXPORT __declspec(dllimport)
+    //#elif __GNUC__ >= 4 // for GCC
+    //    // something here for GCC?
+    #endif // any other compilers require anything like that?
+#endif
+
+#ifndef DLLEXPORT
+    #define DLLEXPORT // so it doesn't fail being undefined
+#endif
+
+namespace prjct
+{
+    namespace lbrAnother
+    {
+        DLLEXPORT void doAnother();
+#ifndef THINGY_INTERFACE
+        DLLEXPORT void doTheThing();
+#endif
+    }
+}
+
+#endif // ANOTHER_H
diff --git a/prjct/libraries/AnotherLibrary/include/another.h b/prjct/libraries/AnotherLibrary/include/another.h
diff --git a/prjct/libraries/AnotherLibrary/src/another.cpp b/prjct/libraries/AnotherLibrary/src/another.cpp
@@ -4,6 +4,7 @@
     #include <Thingy/thingy.h>
 #endif
 
+#include <Another/another.h>
 #include "stuff.h"
 
 namespace prjct

diff --git a/prjct/libraries/SomeLibrary/CMakeLists.txt b/prjct/libraries/SomeLibrary/CMakeLists.txt
@@ -26,7 +26,7 @@ target_include_directories(${PROJECT_NAME}
 
 # without it public headers won't get installed
 set(public_headers
-    include/some.h
+    include/Some/some.h
 )
 
 include(Installing)
diff --git a/prjct/libraries/SomeLibrary/include/Some/some.h b/prjct/libraries/SomeLibrary/include/Some/some.h
@@ -0,0 +1,32 @@
+#ifndef SOME_H
+#define SOME_H
+
+#ifdef SomeLibrary_EXPORTS // CMake sets that when BUILD_SHARED_LIBS=1
+    #ifdef _MSC_VER // for MSVC
+        // export on compiling the DLL (when building)
+        #define DLLEXPORT __declspec(dllexport)
+    //#elif __GNUC__ >= 4 // for GCC
+    //    #define DLLEXPORT __attribute__ ((visibility("default")))
+    #endif // any other compilers require anything like that?
+#else
+    #ifdef _MSC_VER // for MSVC
+        // import on using the created DLL (when using in projects)
+        #define DLLEXPORT __declspec(dllimport)
+    //#elif __GNUC__ >= 4 // for GCC
+    //    // something here for GCC?
+    #endif // any other compilers require anything like that?
+#endif
+
+#ifndef DLLEXPORT
+    #define DLLEXPORT // so it doesn't fail being undefined
+#endif
+
+namespace prjct
+{
+    namespace lbrSome
+    {
+        DLLEXPORT void doSome();
+    }
+}
+
+#endif // SOME_H
diff --git a/prjct/libraries/SomeLibrary/include/some.h b/prjct/libraries/SomeLibrary/include/some.h
diff --git a/prjct/libraries/SomeLibrary/src/some.cpp b/prjct/libraries/SomeLibrary/src/some.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 
+#include <Some/some.h>
 #include "stuff.h"
 
 namespace prjct