Skip to content

Commit

Permalink
Add code causing the error
Browse files Browse the repository at this point in the history
  • Loading branch information
TimPushkin committed May 2, 2022
1 parent f1f197c commit 3460054
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 37 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.22)
cmake_minimum_required(VERSION 3.18)

project(proj)

add_subdirectory(src)
add_subdirectory(external)
add_subdirectory(example)
6 changes: 1 addition & 5 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
cmake_minimum_required(VERSION 3.22)

project(example)

add_executable(example example.cpp)
target_link_libraries(example lib)
target_link_libraries(example ${PROJECT_NAME})
4 changes: 2 additions & 2 deletions example/example.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <lib.h>
#include "../include/SomeClass.h"

int main()
{
Test t;
SomeClass t;
t.func();

return 0;
Expand Down
2 changes: 2 additions & 0 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
add_subdirectory(scapix)
# Other libs here
11 changes: 11 additions & 0 deletions external/scapix/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
include(FetchContent)
FetchContent_Declare(
cmodule
URL "https://github.com/scapix-com/cmodule/archive/refs/tags/v1.0.33.tar.gz"
URL_HASH SHA256=b56bf2f3b5acb979f1242757976eaf525caeea70714caa6e19571f65e0b60727
)
FetchContent_MakeAvailable(cmodule)

find_package(Scapix REQUIRED)

scapix_bridge_headers(${PROJECT_NAME} "com.example.lib" ${CMAKE_SOURCE_DIR}/include/SomeClass.h)
6 changes: 6 additions & 0 deletions include/SomeClass.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include <scapix/bridge/object.h>

class SomeClass : public scapix::bridge::object<SomeClass> {
public:
void func();
};
19 changes: 3 additions & 16 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
cmake_minimum_required(VERSION 3.22)
set(SOURCE_FILES SomeClass.cpp)

project(lib)
add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/include/SomeClass.h)

add_library(lib lib.cpp lib.h)
target_include_directories(lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

include(FetchContent)
FetchContent_Declare(
cmodule
URL "https://github.com/scapix-com/cmodule/archive/refs/tags/v1.0.32.tar.gz"
URL_HASH SHA256=e6937c95d73188a5add846b27cd00160fe4f6ea31af33be417d2ab7ac19bd8d2
)
FetchContent_MakeAvailable(cmodule)

find_package(Scapix REQUIRED)

scapix_bridge_headers(lib "com.example.lib" ${CMAKE_CURRENT_SOURCE_DIR}/lib.h)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/include)
3 changes: 3 additions & 0 deletions src/SomeClass.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "../include/SomeClass.h"

void SomeClass::func() {}
4 changes: 0 additions & 4 deletions src/lib.cpp

This file was deleted.

9 changes: 0 additions & 9 deletions src/lib.h

This file was deleted.

0 comments on commit 3460054

Please sign in to comment.