From df4c637b9425f66c362f17ce345dedb814348f60 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Tue, 24 Aug 2021 20:57:11 +0200 Subject: [PATCH] Fix non recursive cmake building --- CMakeLists.txt | 5 +++-- conanfile.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b850dfd..f8b1a92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ cmake_policy(VERSION 3.1) set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) # define project +#add_definitions(-DCONF_NO_GL) if(DEFINED ENV{CI}) project(rse-texture VERSION 1.0.1.$ENV{CI_BUILD_NUMBER} DESCRIPTION "RogueSquadron Extractor - Texture" LANGUAGES C) set(RSE_TEX_NAME $ENV{CI_OUTPUT_NAME}-${PROJECT_VERSION}) @@ -31,8 +32,8 @@ include_directories(${PNG_INCLUDE_DIR}) # define src/headers files -FILE(GLOB RSE_TEX_SRCS src/*.c) -FILE(GLOB RSE_TEX_HRDS src/*.h) +FILE(GLOB_RECURSE RSE_TEX_SRCS src/*.c) +FILE(GLOB_RECURSE RSE_TEX_HRDS src/*.h) SOURCE_GROUP("Source Files" FILES ${RSE_TEX_SRCS}) SOURCE_GROUP("Header Files" FILES ${RSE_TEX_HRDS}) diff --git a/conanfile.txt b/conanfile.txt index 1337f71..26b54e2 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -11,4 +11,4 @@ zlib:shared=True libpng:shared=True [imports] -bin, *.dll -> ./bin \ No newline at end of file +bin, *.dll -> . \ No newline at end of file