jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
jmsgrogan 2022-08-28 14:57:54 +01:00
commit f119c598d3
7 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -1,4 +1,5 @@
add_subdirectory(core)
add_subdirectory(compiler)
add_subdirectory(compression)
add_subdirectory(database)
add_subdirectory(network)

18
src/compiler/CMakeLists.txt Normal file
View file

@ -0,0 +1,18 @@
list(APPEND compiler_HEADERS
Lexer.h
)
list(APPEND compiler_LIB_INCLUDES
Lexer.cpp
)
add_library(compiler SHARED ${compiler_LIB_INCLUDES} ${compiler_HEADERS})
target_include_directories(compiler PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}"
)
set_target_properties( compiler PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
target_link_libraries( compiler PUBLIC core)
set_property(TARGET compiler PROPERTY FOLDER src)

0
src/compiler/Lexer.cpp Normal file
View file

0
src/compiler/Lexer.h Normal file
View file

5
src/image/CMakeLists.txt
View file

@ -13,6 +13,7 @@ list(APPEND image_LIB_INCLUDES
)
list(APPEND image_LIBS core)
list(APPEND image_DEFINES "")
find_package(PNG QUIET)
if(PNG_FOUND)
@ -20,12 +21,14 @@ list(APPEND image_LIBS PNG::PNG)
list(APPEND image_LIB_INCLUDES
PngWriterLibPng.cpp
)
target_compile_definitions(image PRIVATE HAS_LIBPNG)
list(APPEND image_DEFINES HAS_LIBPNG)
else()
message(STATUS "LIBRARY CHECK: libPNG not found - disabling libPNG based image i/o.")
endif()
add_library(image SHARED ${image_LIB_INCLUDES} ${image_HEADERS})
#target_compile_definitions(image PRIVATE ${image_DEFINES})
target_include_directories(image PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}"