Skip to content

Commit

Permalink
Merge pull request #15 from lucianpls/Hilbert
Browse files Browse the repository at this point in the history
Version 1.1
  • Loading branch information
lucianpls authored Jan 2, 2024
2 parents 780b10f + 34d9a74 commit 3dbce23
Show file tree
Hide file tree
Showing 24 changed files with 907 additions and 1,080 deletions.
76 changes: 46 additions & 30 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,46 @@
cmake_minimum_required(VERSION 3.5)
cmake_policy(SET CMP0076 NEW)

# Has to be before project()
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
"Choose type of build, options are: Debug Release RelWithDebInfo MinSizeRel")
endif(NOT CMAKE_BUILD_TYPE)


project(QB3
LANGUAGES CXX
)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CSS_STANDARD_REQUIRED ON)

find_package(libicd CONFIG REQUIRED)
add_subdirectory(QB3lib)
add_executable(cqb3 cqb3.cpp)

if (MSVC)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
endif (MSVC)

# On AMD64 uncomment to use avx2 -> faster code
# target_compile_options(cqb3 PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/arch:AVX2>)
# target_compile_options(cqb3 PRIVATE $<$<CXX_COMPILER_ID:GNU>:-mavx2>)

target_link_libraries(cqb3 PRIVATE AHTSE::libicd libQB3)
cmake_minimum_required(VERSION 3.5)
cmake_policy(SET CMP0076 NEW)

# Has to be before project()
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
"Choose type of build, options are: Debug Release RelWithDebInfo MinSizeRel")
endif(NOT CMAKE_BUILD_TYPE)


project(QB3
LANGUAGES CXX
)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CSS_STANDARD_REQUIRED ON)

add_subdirectory(QB3lib)

option(BUILD_CQB3 "Build QB3 image conversion utility" OFF)
option(QB3_DEV "QB3 development utility, internal use only" OFF)

# The executables need libicd to read and write other formats
# From https://github.com/lucianpls/libicd

if (${BUILD_CQB3})
add_executable(cqb3 cqb3.cpp)
find_package(libicd CONFIG REQUIRED)
if (MSVC)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
endif (MSVC)
target_link_libraries(cqb3 PRIVATE AHTSE::libicd libQB3)
install(TARGETS cqb3)
endif()

if (${QB3_DEV})
add_executable(test_qb3 test_qb3.cpp)
find_package(libicd CONFIG REQUIRED)

# On AMD64 uncomment to use avx2 -> faster code
# target_compile_options(cqb3 PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/arch:AVX2>)
# target_compile_options(cqb3 PRIVATE $<$<CXX_COMPILER_ID:GNU>:-mavx2>)

target_link_libraries(test_qb3 PRIVATE AHTSE::libicd libQB3)
install(TARGETS test_qb3)
endif()
63 changes: 0 additions & 63 deletions MSVC/QB3.sln

This file was deleted.

114 changes: 0 additions & 114 deletions MSVC/QB3.vcxproj

This file was deleted.

18 changes: 0 additions & 18 deletions MSVC/QB3.vcxproj.filters

This file was deleted.

Loading

0 comments on commit 3dbce23

Please sign in to comment.