[cpp] Fix up root CMakeLists.txt to always include spine-c, spine-cpp, and spine-cpp-unit-tests

This commit is contained in:
Mario Zechner 2023-04-28 13:54:59 +02:00
parent 42626d7ff7
commit 3545fa9f32
3 changed files with 6 additions and 15 deletions

View File

@ -20,6 +20,10 @@ else()
endif()
endif()
add_subdirectory(spine-c)
add_subdirectory(spine-cpp)
add_subdirectory(spine-cpp/spine-cpp-unit-tests)
if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_OSX_ARCHITECTURES x86_64)
@ -27,7 +31,6 @@ if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml"))
endif()
add_subdirectory(spine-c)
add_subdirectory(spine-sfml/c)
add_subdirectory(spine-cpp)
add_subdirectory(spine-sfml/cpp)
endif()
@ -37,9 +40,6 @@ if((${SPINE_SDL}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sdl"))
set(ONLY_ACTIVE_ARCH NO)
endif()
add_subdirectory(spine-c)
add_subdirectory(spine-cpp)
add_subdirectory(spine-sdl)
endif()
# add_subdirectory(spine-c/spine-c-unit-tests)
add_subdirectory(spine-cpp/spine-cpp-unit-tests)

View File

@ -1,18 +1,9 @@
project(spine_cpp_unit_test)
set(CMAKE_INSTALL_PREFIX "./")
set(CMAKE_VERBOSE_MAKEFILE ON)
include_directories(../spine-cpp/include teamcity minicppunit tests memory)
set(SRC
src/main.cpp
)
set(SRC src/main.cpp)
add_executable(spine_cpp_unit_test ${SRC})
target_link_libraries(spine_cpp_unit_test spine-cpp)
#########################################################
# copy resources to build output directory
#########################################################

View File

@ -102,7 +102,7 @@ namespace spine {
SpineExtension *getDefaultExtension() {
return new DefaultSpineExtension();
}
}// namespace spine
}
int main(int argc, char **argv) {
SP_UNUSED(argc);