.cube file loading, .smcube file loading/saving

Author: aras-p

CMakeLists.txt

@@ -2,59 +2,23 @@ cmake_minimum_required (VERSION 3.21)
 if(POLICY CMP0091)
     cmake_policy(SET CMP0091 NEW) # enable MSVC_RUNTIME_LIBRARY
 endif()
-if(POLICY CMP0077)
-    cmake_policy(SET CMP0077 NEW) # enable override of options from parent CMakeLists.txt
-endif()
-if(POLICY CMP0135)
-	cmake_policy(SET CMP0135 NEW) # avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24+
-endif()
-if(POLICY CMP0092)
-    cmake_policy(SET CMP0092 NEW) # enables /W4 override for MSVC
-endif()
-
-include(FetchContent)
-
-# zstd
-FetchContent_Declare(
-	zstd
-	URL https://github.com/facebook/zstd/archive/refs/tags/v1.5.6.zip # latest (2024 Mar) at time of writing
-	SOURCE_SUBDIR build/cmake
-)
-set(ZSTD_LEGACY_SUPPORT OFF)
-set(ZSTD_MULTITHREAD_SUPPORT OFF)
-set(ZSTD_BUILD_TESTS OFF)
-set(ZSTD_BUILD_PROGRAMS OFF)
-set(ZSTD_BUILD_CONTRIB OFF)
-set(ZSTD_BUILD_STATIC ON)
-set(ZSTD_BUILD_SHARED OFF)
-FetchContent_MakeAvailable(zstd)
 
 project ("smol-cube")
 
 add_executable (smol-cube
 	src/main.cpp
-	src/compression_helpers.cpp
-	src/compression_helpers.h
-		
-	src/filters.cpp
-	src/filters.h
-	src/simd.h
 	src/smol_cube.cpp
 	src/smol_cube.h
-	src/systeminfo.cpp
-	src/systeminfo.h
-
 	CMakeLists.txt
 	CMakePresets.json
 )
-set_property(TARGET smol-cube PROPERTY CXX_STANDARD 20)
+set_property(TARGET smol-cube PROPERTY CXX_STANDARD 17)
+set_property(TARGET smol-cube PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 target_include_directories(smol-cube PRIVATE 
-	${zstd_SOURCE_DIR}/lib
 )
 
 target_link_libraries(smol-cube PRIVATE
-	libzstd_static
 )
 
 target_compile_definitions(smol-cube PRIVATE
@@ -66,24 +30,3 @@ target_compile_definitions(smol-cube PRIVATE
 if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64"))
 	target_compile_options(smol-cube PRIVATE -msse4.1)
 endif()
-
-
-# Enable debug symbols (RelWithDebInfo is not only that; it also turns on
-# incremental linking, disables some inlining, etc. etc.)
-set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym")
-set(CMAKE_XCODE_ATTRIBUTE_COPY_PHASE_STRIP "NO")
-set(CMAKE_XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCT "NO")
-
-# note: this does not work; have to pass -g instead
-#set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS "YES")
-
-if (CMAKE_BUILD_TYPE STREQUAL "Release")
-	if (MSVC)
-		target_compile_options(smol-cube PRIVATE /Zi)
-		target_link_options(smol-cube PRIVATE /DEBUG /OPT:ICF /OPT:REF)
-	endif()
-	if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		target_compile_options(smol-cube PRIVATE -g)
-		target_link_options(smol-cube PRIVATE -g)
-	endif()
-endif ()

CMakePresets.json

@@ -35,8 +35,8 @@
       },
       "cacheVariables": {
         "CMAKE_OSX_DEPLOYMENT_TARGET": "10.14"
-      }            
-    },    
+      }
+    },
     {
       "name": "x64-debug",
       "displayName": "x64 Debug",
@@ -58,21 +58,11 @@
       }
     },
     {
-      "name": "x64-debug-cl",
-      "displayName": "x64 Debug clang",
+      "name": "x64-release-dbg",
+      "displayName": "x64 RelWithDebInfo",
       "inherits": "x64-debug",
       "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang-cl",
-        "CMAKE_CXX_COMPILER": "clang-cl"
-      }
-    },
-    {
-      "name": "x64-release-cl",
-      "displayName": "x64 Release clang",
-      "inherits": "x64-release",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang-cl",
-        "CMAKE_CXX_COMPILER": "clang-cl"
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
     },
     {
@@ -90,6 +80,6 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release"
       }
-    }    
+    }
   ]
 }

launch.vs.json

@@ -0,0 +1,19 @@
+{
+  "version": "0.2.1",
+  "defaults": {},
+  "configurations": [
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "smol-cube.exe",
+      "name": "smol-cube.exe",
+      "currentDir": "${workspaceRoot}",
+      "args": [
+        "--verbose",
+        "--roundtrip",
+        "tests/luts/synthetic/shaper_3d.cube",
+        "\"tests/luts/davinci/LMT ACES v0.1.1.cube\""
+      ]
+    }
+  ]
+}