From f4a4f65f4cb22e5b8902e9047bb17badb358b3d2 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sun, 28 Jan 2024 18:38:53 -0800 Subject: [PATCH] fixed path --- .github/workflows/solaris.yml | 2 +- build/cmake/CMakeModules/AddZstdCompilationFlags.cmake | 2 +- build/cmake/contrib/CMakeLists.txt | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml index abfabd548c..b1adfcbed6 100644 --- a/.github/workflows/solaris.yml +++ b/.github/workflows/solaris.yml @@ -51,5 +51,5 @@ jobs: cmake --version rm -rf cmakebuild install mkdir -p cmakebuild install - cd cmakebuild; cmake -Wdev -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror -O0" -DCMAKE_INSTALL_PREFIX=install ../build/cmake + cd cmakebuild; cmake -Wdev -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror -O0" -DCMAKE_INSTALL_PREFIX=install ../build/cmake; cd .. cmake --build cmakebuild --target install -- -j V=1 diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake index 5f179989b6..5a0fd8199d 100644 --- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake +++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake @@ -51,7 +51,7 @@ function(EnableCompilerFlag _flag _C _CXX _LD) endfunction() macro(ADD_ZSTD_COMPILATION_FLAGS) - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) #Not only UNIX but also WIN32 for MinGW + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) # Not only UNIX but also WIN32 for MinGW # It's possible to select the exact standard used for compilation. # It's not necessary, but can be employed for specific purposes. # Note that zstd source code is compatible with both C++98 and above diff --git a/build/cmake/contrib/CMakeLists.txt b/build/cmake/contrib/CMakeLists.txt index 8df2a17b3a..48201f770a 100644 --- a/build/cmake/contrib/CMakeLists.txt +++ b/build/cmake/contrib/CMakeLists.txt @@ -7,7 +7,11 @@ # in the COPYING file in the root directory of this source tree). # ################################################################ -project(contrib) +project(contrib + LANGUAGES C # Main library is in C + ASM # And ASM + CXX # pzstd, gen_html +) add_subdirectory(pzstd) add_subdirectory(gen_html)