diff --git a/CMakeLists.txt b/CMakeLists.txt index 070d4525e..ddf992380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules") include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake") # Setup project +configureCMake() loadVersion(IMHEX_VERSION) setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION}) project(imhex diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 624e40125..073a4bac1 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -318,6 +318,16 @@ function(JOIN OUTPUT GLUE) set(${OUTPUT} "${_TMP_RESULT}" PARENT_SCOPE) endfunction() +macro(configureCMake) +endmacro() + +function(message ${ARGN}) + # Supress any NOTICE messages + if (ARGC GREATER 1) + _message(${ARGN}) + endif() +endfunction() + macro(setDefaultBuiltTypeIfUnset) if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Using Release build type as it was left unset" FORCE) @@ -437,7 +447,7 @@ macro(addBundledLibraries) set(EXTERN_LIBS_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/lib/external") - set(BUILD_SHARED_LIBS OFF) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries") add_subdirectory(${EXTERN_LIBS_FOLDER}/imgui) set_target_properties(imgui PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 9aea9ed97..5852af1ba 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 9aea9ed97d7623684b7ad637f60dd2f64451a396 +Subproject commit 5852af1ba9f283ce76d1ac919c143e9d7b0942dd