Merge pull request #362 from opcm/opcm-cmake-updates

cmake updates
intel · Jan 26, 2022 · 8083bb5 · 8083bb5
2 parents d8aae2c + ce3f809
commit 8083bb5
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 31 deletions.
diff --git a/.github/workflows/ci-cmake-options.yml b/.github/workflows/ci-cmake-options.yml
@@ -0,0 +1,102 @@
+name: test cmake options
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  build:
+
+    runs-on: ci-gcc10
+    if: ${{ github.repository != 'opcm/pcm' }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Preparation
+      run: |
+        cd ${{ github.workspace }}/src
+        git clone https://github.com/simdjson/simdjson.git
+        cd ..
+
+    - name: CMake default install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc) 
+
+    - name: CMake Release install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=Release
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc) 
+
+    - name: CMake Debug install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=Debug
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc) 
+
+    - name: CMake RelWithDebInfo install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=RelWithDebInfo
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc) 
+
+    - name: CMake Custom build install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_CXX_FLAGS_CUSTOM:STRING="-O2 -g" -DCMAKE_BUILD_TYPE=CUSTOM
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc)
+
+    - name: CMake User-flags build install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_CXX_FLAGS="-O2 -g -fPIC"
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc)
+
+    - name: CMake env var option build install
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        export CXXFLAGS="-grecord-gcc-switches"
+        export CFLAGS="-fstack-protector-strong"
+        export LDFLAGS="-Wl,-z,now"
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_CXX_FLAGS_CUSTOM:STRING="-O2 -g -fPIC" -DCMAKE_BUILD_TYPE=CUSTOM
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc)
+
+    - name: CMake env var option build install (no custom flags)
+      run: |
+        cmake --version
+        rm -rf ${{ github.workspace }}/build
+        export CXXFLAGS="-grecord-gcc-switches"
+        export CFLAGS="-fstack-protector-strong"
+        export LDFLAGS="-Wl,-z,now"
+        cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=CUSTOM
+        cd ${{ github.workspace }}/build
+        export VERBOSE=1
+        make install -j$(nproc)
+
+    - name: Diagnostic
+      run: date
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,32 @@ if(UNIX)  # APPLE, LINUX, FREE_BSD
       set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
     endif()
     message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+
+    message(STATUS "initial CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+    message(STATUS "initial CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+
+    # required PCM common flags
+    set (PCM_COMMON_FLAGS "-Wno-unknown-pragmas -fPIC")
+
+    if(LINUX)
+       set (PCM_COMMON_FLAGS "${PCM_COMMON_FLAGS} -Wextra -DPCM_USE_PERF")
+    endif(LINUX)
+
+    # adding the required PCM common flags
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PCM_COMMON_FLAGS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PCM_COMMON_FLAGS}")
+
+    message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+    message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+
+    set(PCM_OPTIONAL_FLAGS "-Wall")
+    set(CMAKE_CXX_FLAGS_RELEASE "${PCM_OPTIONAL_FLAGS} -O3")
+    set(CMAKE_CXX_FLAGS_DEBUG "${PCM_OPTIONAL_FLAGS} -O0 -g")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${PCM_OPTIONAL_FLAGS} -O3 -g")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+
 endif(UNIX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -8,10 +8,6 @@
 # * Neither the name of Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-set(CMAKE_C_FLAGS "-Wall -Wno-unknown-pragmas -fPIC")
-set(CMAKE_C_FLAGS_RELEASE "-O3")
-set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/examples)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,31 +10,16 @@
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Flags settings
-set(CMAKE_CXX_FLAGS "")
-if(LINUX)
-    set(CMAKE_CXX_FLAGS "-Wall -fPIC -Wno-unknown-pragmas -Wextra -DPCM_USE_PERF")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g")
-endif(LINUX)
-
-if(FREE_BSD)
-    set(CMAKE_CXX_FLAGS "-Wall -fPIC -Wno-unknown-pragmas")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g")
-endif(FREE_BSD)
+if(UNIX)
 
-if(APPLE)
-    set(CMAKE_CXX_FLAGS "-Wall -fPIC -Wno-unknown-pragmas")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-    add_subdirectory(MacMSRDriver)
-endif(APPLE)
+    if(APPLE)
+        add_subdirectory(MacMSRDriver)
+    endif(APPLE)
+
+endif(UNIX)
 
 if(MSVC)
-     set(CMAKE_CXX_FLAGS "/O2 /wd4251 /wd4273")
-     set(CMAKE_CXX_FLAGS_RELEASE "/O2 /wd4251 /wd4273")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /wd4251 /wd4273")
      add_definitions(/W3)
 endif(MSVC)
 
@@ -70,7 +55,7 @@ if(APPLE)
 endif(APPLE)
 
 if(MSVC)
-    set(CMAKE_CXX_FLAGS "/EHa /Zi")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa /Zi")
     # https://cmake.org/cmake/help/latest/prop_tgt/MSVC_RUNTIME_LIBRARY.html
     # windows/restrictDriverAccess.cpp is building separately
     add_library(restrictDriverAccess OBJECT windows/restrictDriverAccess.cpp)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -8,10 +8,6 @@
 # * Neither the name of Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-set(CMAKE_CXX_FLAGS "-Wall -Wno-unknown-pragmas -fPIC")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests)