Use binary atdna, universal macOS fixes, more

2025-12-08 11:44:55 +00:00 · 2021-04-13 10:42:01 -04:00
parent 4e38cf3574
commit 7d7db261a2
18 changed files with 479 additions and 278 deletions
--- a/hecl/CMakeLists.txt
+++ b/hecl/CMakeLists.txt
@@ -52,12 +52,12 @@ endforeach()

 configure_file(include/hecl/ApplicationReps.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/ApplicationReps.hpp @ONLY)

-add_subdirectory(bintoc)
-
-if(NOT TARGET bintoc)
-  # Use native if cross compiling
-  find_package(hecl-bintoc REQUIRED)
-endif()
+include(ExternalProject)
+ExternalProject_Add(bintoc
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bintoc"
+    CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --config Release --target install)
+include(bintoc/bintocHelpers.cmake)

 if(NOT TARGET atdna)
  # Import native atdna if cross-compiling
--- a/hecl/bintoc/CMakeLists.txt
+++ b/hecl/bintoc/CMakeLists.txt
@@ -1,62 +1,9 @@
-if(NOT CMAKE_CROSSCOMPILING)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
+cmake_policy(VERSION 3.15...3.20)
+project(bintoc LANGUAGES C)
+
 add_executable(bintoc bintoc.c)
-target_include_directories(bintoc PRIVATE ${ZLIB_INCLUDE_DIR})
-target_link_libraries(bintoc ${ZLIB_LIBRARIES})
-function(bintoc out in sym)
-  if(IS_ABSOLUTE ${out})
-    set(theOut ${out})
-  else()
-    set(theOut ${CMAKE_CURRENT_BINARY_DIR}/${out})
-  endif()
-  if(IS_ABSOLUTE ${in})
-    set(theIn ${in})
-  else()
-    set(theIn ${CMAKE_CURRENT_SOURCE_DIR}/${in})
-  endif()
-  get_filename_component(outDir ${theOut} DIRECTORY)
-  file(MAKE_DIRECTORY ${outDir})
-  add_custom_command(OUTPUT ${theOut}
-                     COMMAND $<TARGET_FILE:bintoc> ARGS ${theIn} ${theOut} ${sym}
-                     DEPENDS ${theIn} bintoc)
-endfunction()
-function(bintoc_compress out in sym)
-  if(IS_ABSOLUTE ${out})
-    set(theOut ${out})
-  else()
-    set(theOut ${CMAKE_CURRENT_BINARY_DIR}/${out})
-  endif()
-  if(IS_ABSOLUTE ${in})
-    set(theIn ${in})
-  else()
-    set(theIn ${CMAKE_CURRENT_SOURCE_DIR}/${in})
-  endif()
-  get_filename_component(outDir ${theOut} DIRECTORY)
-  file(MAKE_DIRECTORY ${outDir})
-  add_custom_command(OUTPUT ${theOut}
-                     COMMAND $<TARGET_FILE:bintoc> ARGS --compress ${theIn} ${theOut} ${sym}
-                     DEPENDS ${theIn} bintoc)
-endfunction()
+find_package(ZLIB REQUIRED)
+target_link_libraries(bintoc PRIVATE ZLIB::ZLIB)

-##################
-# Package Export #
-##################
-
-# Add all targets to the build-tree export set
-export(TARGETS bintoc FILE "${CMAKE_CURRENT_BINARY_DIR}/hecl-bintocTargets.cmake")
-
-# Export the package for use from the build-tree
-# (this registers the build-tree with a global CMake-registry)
-export(PACKAGE hecl-bintoc)
-
-# Create the atdnaConfig.cmake
-# ... for the build tree
-configure_file(hecl-bintocConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/hecl-bintocConfig.cmake" @ONLY)
-# ... for the install tree
-configure_file(hecl-bintocConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hecl-bintocConfig.cmake" @ONLY)
-# ... for both
-configure_file(hecl-bintocConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/hecl-bintocConfigVersion.cmake" @ONLY)
-
-else()
-# Use native if cross compiling
-find_package(hecl-bintoc REQUIRED)
-endif()
+install(TARGETS bintoc DESTINATION bin)
--- a/hecl/bintoc/hecl-bintocConfig.cmake.in
+++ b/hecl/bintoc/hecl-bintocConfig.cmake.in
@@ -1,13 +1,3 @@
-# - Config file for the bintoc package
-
-# Compute paths
-get_filename_component(BINTOC_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-# Our library dependencies (contains definitions for IMPORTED targets)
-if(NOT TARGET bintoc AND NOT bintoc_BINARY_DIR)
-  include("${BINTOC_CMAKE_DIR}/hecl-bintocTargets.cmake")
-endif()
-
 function(bintoc out in sym)
  if(IS_ABSOLUTE ${out})
    set(theOut ${out})
@@ -21,9 +11,10 @@ function(bintoc out in sym)
  endif()
  get_filename_component(outDir ${theOut} DIRECTORY)
  file(MAKE_DIRECTORY ${outDir})
+  ExternalProject_Get_Property(bintoc INSTALL_DIR)
  add_custom_command(OUTPUT ${theOut}
-                     COMMAND $<TARGET_FILE:bintoc> ARGS ${theIn} ${theOut} ${sym}
-                     DEPENDS ${theIn})
+                     COMMAND "${INSTALL_DIR}/bin/bintoc" ARGS ${theIn} ${theOut} ${sym}
+                     DEPENDS ${theIn} bintoc)
 endfunction()

 function(bintoc_compress out in sym)
@@ -39,7 +30,8 @@ function(bintoc_compress out in sym)
  endif()
  get_filename_component(outDir ${theOut} DIRECTORY)
  file(MAKE_DIRECTORY ${outDir})
+  ExternalProject_Get_Property(bintoc INSTALL_DIR)
  add_custom_command(OUTPUT ${theOut}
-                     COMMAND $<TARGET_FILE:bintoc> ARGS --compress ${theIn} ${theOut} ${sym}
-                     DEPENDS ${theIn})
+                     COMMAND "${INSTALL_DIR}/bin/bintoc" ARGS --compress ${theIn} ${theOut} ${sym}
+                     DEPENDS ${theIn} bintoc)
 endfunction()
--- a/hecl/bintoc/hecl-bintocConfigVersion.cmake.in
+++ b/hecl/bintoc/hecl-bintocConfigVersion.cmake.in
@@ -1,12 +0,0 @@
-set(PACKAGE_VERSION "@BINTOC_VERSION@")
- 
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-    set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
-
--- a/hecl/lib/CMakeLists.txt
+++ b/hecl/lib/CMakeLists.txt
@@ -87,12 +87,6 @@ target_link_libraries(hecl-light PUBLIC ${HECL_APPLICATION_REPS_TARGETS_LIST} bo
 target_atdna(hecl-light atdna_HMDLMeta_light.cpp ../include/hecl/HMDLMeta.hpp)
 target_atdna(hecl-light atdna_CVar_light.cpp ../include/hecl/CVar.hpp)

-add_library(hecl-compilers Compilers.cpp WideStringConvert.cpp)
-get_target_property(BOO_INCLUDES boo INTERFACE_INCLUDE_DIRECTORIES)
-target_include_directories(hecl-compilers PUBLIC ../include ${BOO_INCLUDES})
-target_link_libraries(hecl-compilers PUBLIC athena-core logvisor xxhash
-        glslang OSDependent OGLCompiler SPIRV glslang-default-resource-limits)
-
 if(COMMAND add_sanitizers)
  add_sanitizers(hecl-full)
  add_sanitizers(hecl-light)
--- a/hecl/lib/WideStringConvert.cpp
+++ b/hecl/lib/WideStringConvert.cpp
@@ -1,5 +1,5 @@
 #include <logvisor/logvisor.hpp>
-#include <utf8proc.h>
+#include <athena/utf8proc.h>

 namespace hecl {
 static logvisor::Module Log("hecl-wsconv");
--- a/hecl/shaderc/CMakeLists.txt
+++ b/hecl/shaderc/CMakeLists.txt
@@ -1,7 +1,91 @@
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
+cmake_policy(VERSION 3.15...3.20)
+project(shaderc LANGUAGES C CXX)
+
+if (MSVC)
+  # Shaddup MSVC
+  add_compile_definitions(UNICODE=1 _UNICODE=1 __SSE__=1
+      _CRT_SECURE_NO_WARNINGS=1 D_SCL_SECURE_NO_WARNINGS=1
+      _SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
+      _ENABLE_EXTENDED_ALIGNED_STORAGE=1 NOMINMAX=1)
+  add_compile_options(/IGNORE:4221
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4018>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4800>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4005>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4311>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4068>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4267>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4244>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4200>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4305>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4067>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4146>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4309>
+      $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4805>
+      ${VS_OPTIONS})
+
+  string(REPLACE "/GR " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  add_compile_options(
+      # Disable exceptions
+      $<$<COMPILE_LANGUAGE:CXX>:/EHsc->
+
+      # Disable RTTI
+      $<$<COMPILE_LANGUAGE:CXX>:/GR->
+
+      # Enforce various standards compliant behavior.
+      $<$<COMPILE_LANGUAGE:CXX>:/permissive->
+
+      # Enable standard volatile semantics.
+      $<$<COMPILE_LANGUAGE:CXX>:/volatile:iso>
+
+      # Reports the proper value for the __cplusplus preprocessor macro.
+      $<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>
+
+      # Use latest C++ standard.
+      $<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>
+  )
+
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    # Flags for MSVC (not clang-cl)
+    add_compile_options(
+        # Allow constexpr variables to have explicit external linkage.
+        $<$<COMPILE_LANGUAGE:CXX>:/Zc:externConstexpr>
+
+        # Assume that new throws exceptions, allowing better code generation.
+        $<$<COMPILE_LANGUAGE:CXX>:/Zc:throwingNew>
+
+        # Link-time Code Generation for Release builds
+        $<$<CONFIG:Release>:/GL>
+    )
+
+    # Link-time Code Generation for Release builds
+    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/LTCG")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/RELEASE /LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+    set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/DEBUG /RELEASE /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:cv,fixup")
+  endif()
+else()
+  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif ()
+
+# two step: --target shaderc, --target install
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
+
+add_subdirectory(../../extern/athena athena)
+add_subdirectory(../../extern/boo boo)
+
+add_library(hecl-compilers ../lib/Compilers.cpp ../lib/WideStringConvert.cpp)
+get_target_property(BOO_INCLUDES boo INTERFACE_INCLUDE_DIRECTORIES)
+target_include_directories(hecl-compilers PUBLIC ../include ${BOO_INCLUDES})
+target_link_libraries(hecl-compilers PUBLIC athena-core logvisor xxhash
+    glslang OSDependent OGLCompiler SPIRV glslang-default-resource-limits)
+
 add_library(shaderc_lib shaderc.cpp shaderc.hpp)
 target_link_libraries(shaderc_lib PUBLIC hecl-compilers athena-core logvisor)
 add_executable(shaderc main.cpp)
 target_link_libraries(shaderc shaderc_lib)
+
 if (NOT WIN32)
  target_link_libraries(shaderc pthread)
  if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -10,29 +94,5 @@ if (NOT WIN32)
    target_link_libraries(shaderc dl)
  endif()
 endif()
-if(COMMAND add_sanitizers)
-  add_sanitizers(shaderc_lib)
-  add_sanitizers(shaderc)
-endif()

-function(shaderc out)
-  if(IS_ABSOLUTE ${out})
-    set(theOut ${out})
-  else()
-    set(theOut ${CMAKE_CURRENT_BINARY_DIR}/${out})
-  endif()
-  unset(theInsList)
-  foreach(in ${ARGN})
-    if(IS_ABSOLUTE ${in})
-      list(APPEND theInsList ${in})
-    else()
-      list(APPEND theInsList ${CMAKE_CURRENT_SOURCE_DIR}/${in})
-    endif()
-  endforeach()
-  get_filename_component(outDir ${theOut} DIRECTORY)
-  file(MAKE_DIRECTORY ${outDir})
-  file(RELATIVE_PATH outRel ${CMAKE_BINARY_DIR} ${theOut})
-  add_custom_command(OUTPUT ${theOut}.cpp ${theOut}.hpp
-          COMMAND $<TARGET_FILE:shaderc> ARGS -o ${theOut} ${theInsList}
-          DEPENDS ${theInsList} shaderc COMMENT "Compiling shader ${outRel}.shader")
-endfunction()
+install(TARGETS shaderc DESTINATION bin)