OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added: stb_image.h as 3rd-party include

Browse Source
This commit is contained in:
Knut Morten Okstad 2018-10-08 07:09:44 +02:00
parent 16fd269242
commit f91f17c2de
3 changed files with 7468 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7462
3rdparty/stb_image.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

8
CMakeLists.txt
View File

@ -47,18 +47,18 @@ endif()
if(LRSpline_LIBRARIES AND LRSpline_INCLUDE_DIRS)
set(IFEM_INCLUDES ${IFEM_INCLUDES}
${PROJECT_SOURCE_DIR}/src/ASM/LR)
ENDIF()
endif()
# Required include directories
set(IFEM_INCLUDES
${IFEM_INCLUDES}
${IFEM_DEPINCLUDES}
${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/ASM
${PROJECT_SOURCE_DIR}/src/Eig
${PROJECT_SOURCE_DIR}/src/LinAlg
${PROJECT_SOURCE_DIR}/src/SIM
${PROJECT_SOURCE_DIR}/src/Utility
${PROJECT_SOURCE_DIR}/3rdparty
${PROJECT_SOURCE_DIR}/3rdparty/expreval
${PROJECT_SOURCE_DIR}/3rdparty/gtest/include
${PROJECT_BINARY_DIR}
@ -166,8 +166,8 @@ else()
src/ASM/LocalIntegral.h src/ASM/SAMpatch.h
src/ASM/TimeDomain.h src/ASM/ASMs?D.h src/ASM/ASM?D.h
src/ASM/DomainDecomposition.h
src/LinAlg/*.h src/SIM/*.h
src/Utility/*.h
src/LinAlg/*.h src/SIM/*.h src/Utility/*.h
3rdparty/*.h
${CMAKE_BINARY_DIR}/IFEM.h)
if(NOT IFEM_USE_SYSTEM_TINYXML)
list(APPEND IFEM_HEADERS 3rdparty/tinyxml/tinyxml.h)

3
cmake/Modules/FindIFEM.cmake
View File

@ -40,7 +40,7 @@ if(NOT IFEM_AS_SUBMODULE)
${PROJECT_SOURCE_DIR}/../../../..
NO_DEFAULT_PATHS)
set(IFEM_H_PATH ${IFEM_PATH})
endif(NOT IFEM_PATH)
endif()
endif()
if(IFEM_AS_SUBMODULE)
@ -74,6 +74,7 @@ else()
${IFEM_PATH}/src/LinAlg
${IFEM_PATH}/src/SIM
${IFEM_PATH}/src/Utility
${IFEM_PATH}/3rdparty
${IFEM_PATH}/3rdparty/gtest/include)
find_library(IFEM_LIBRARIES