Skip to content

Commit

Permalink
find programfilesx86 for zstd
Browse files Browse the repository at this point in the history
  • Loading branch information
horta committed Jun 22, 2021
1 parent 6fecc20 commit ead5e10
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(bgen VERSION 4.1.1 LANGUAGES C)
project(bgen VERSION 4.1.2 LANGUAGES C)
set(PROJECT_DESCRIPTION "It fully supports the BGEN format specifications 1.2 and 1.3.")

# Generate compile_commands.json file
Expand Down
2 changes: 2 additions & 0 deletions cmake/FindZSTD.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
set(zstd_incl_dirs "/usr/include" "/usr/local/include")
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(zstd_incl_dirs ${zstd_incl_dirs} "$ENV{PROGRAMFILES}/zstd/include")
set(zstd_incl_dirs ${zstd_incl_dirs} "$ENV{PROGRAMFILES(x86)}/zstd/include")
set(zstd_incl_dirs ${zstd_incl_dirs} "$ENV{PROGRAMDATA}/chocolatey/lib/zstandard/tools/include")
endif()

Expand All @@ -45,6 +46,7 @@ find_path(
set(zstd_lib_dirs "/usr/lib" "/usr/local/lib")
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(zstd_lib_dirs ${zstd_lib_dirs} "$ENV{PROGRAMFILES}/zstd/lib")
set(zstd_lib_dirs ${zstd_lib_dirs} "$ENV{PROGRAMFILES(x86)}/zstd/lib")
set(zstd_lib_dirs ${zstd_lib_dirs} "$ENV{PROGRAMDATA}/chocolatey/lib/zstandard/tools/dll")
endif()

Expand Down

0 comments on commit ead5e10

Please sign in to comment.