fixed path

diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml
index abfabd548c3838bf42358832e826be41bfe21567..b1adfcbed6c78b4abcdd3df48ab311170709742b 100644 (file)
--- 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 5f179989b687a3661fd9fa3a58b85264a96044ff..5a0fd8199d279a60906be042f2f23ef43618c491 100644 (file)
--- 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 8df2a17b3a8cf8fca574ed0889c266844eca7acf..48201f770a51e91832f34c18cafc0a49c1d087c4 100644 (file)
--- 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)