drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Squashed 'deps/ox/' changes from c63e0c1..bf5c4e2

Browse Source 
bf5c4e2 Add missing optype.hpp file
fdcc303 Removed unused CMake file
4e1f304 Fix version mismatch when loading FileSystems
565c56e Increment FileStore version for inode ID size change
64543b7 Bump FileStore32's InodeId type to uint16_t
fe062cf Add methods for getting array and string length of Metal Claw fields
8deae14 Add general ioOp that will call ioOpRead or ioOpWrite
009cf99 Add OpType for Metal Claw operators
1cf6164 Remove array globals from OxStd, as they were causing section overlaps on GBA
3ffba29 Add op(const char*, (u)int8_t) methods to MetalClaw
489736d Add an optional sizeOut parameter to Metal Claw write
443a62c Fix ArrayLength type case in Metal Claw writer
a46fc8b Add MetalClaw to OxConfig.cmake

git-subtree-dir: deps/ox
git-subtree-split: bf5c4e2c47
This commit is contained in:
Gary Talent
2017-12-22 00:31:12 -06:00
parent 8559ab53cc
commit 12371c21d2
13 changed files with 143 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Modules/FindJansson.cmake
-49
View File
@@ -1,49 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# - Try to find Jansson
# Once done this will define
# JANSSON_FOUND - System has Jansson
# JANSSON_INCLUDE_DIRS - The Jansson include directories
# JANSSON_LIBRARIES - The libraries needed to use Jansson
# JANSSON_DEFINITIONS - Compiler switches required for using Jansson
find_path(JANSSON_INCLUDE_DIR jansson.h
PATHS
/usr/include
/usr/local/include
)
find_library(JANSSON_LIBRARY
NAMES
jansson
PATHS
/usr/lib
/usr/local/lib
)
set(JANSSON_LIBRARIES ${JANSSON_LIBRARY})
set(JANSSON_INCLUDE_DIRS ${JANSSON_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set JANSSON_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(Jansson DEFAULT_MSG
JANSSON_LIBRARY JANSSON_INCLUDE_DIR)
mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY)