Better CMake structure

hivesolutions · Apr 19, 2020 · c308ab1 · c308ab1
1 parent 8dea7cf
commit c308ab1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,13 +14,17 @@ jobs:
         run: |
           apt-get update && apt-get install -y -q wget libssl-dev
           wget https://github.com/Kitware/CMake/releases/download/v3.16.6/cmake-3.16.6.tar.gz && tar -zxvf cmake-3.16.6.tar.gz && cd cmake-3.16.6 && ./bootstrap && make && make install
-      - name: Build P(NG)Convert
+      - name: Build & Install Dependencies
         run: |
           apt-get update && apt-get install -y -q python python-pip python-dev libpng-dev
           pip install --upgrade conan urllib3
           conan install . --build
+      - name: Build P(NG)Convert
+        run: |
           make
-          ./pconvert version
+      - name: Test P(NG)Convert
+        run: |
+          ./bin/pconvert version
   build-clang:
     name: Build Clang
     strategy:
@@ -34,11 +38,13 @@ jobs:
         run: |
           apt-get update && apt-get install -y -q wget libssl-dev
           wget https://github.com/Kitware/CMake/releases/download/v3.16.6/cmake-3.16.6.tar.gz && tar -zxvf cmake-3.16.6.tar.gz && cd cmake-3.16.6 && ./bootstrap && make && make install
-      - name: Build P(NG)Convert
+      - name: Build & Install Dependencies
         run: |
           apt-get update && apt-get install -y -q python python-pip python-dev libpng-dev wget libssl-dev
           pip install --upgrade conan urllib3
           conan install . --build
+      - name: Build P(NG)Convert
+        run: |
           make CC=clang
       - name: Test P(NG)Convert
         run: |
@@ -56,11 +62,13 @@ jobs:
         run: |
           apt-get update && apt-get install -y -q wget libssl-dev
           wget https://github.com/Kitware/CMake/releases/download/v3.16.6/cmake-3.16.6.tar.gz && tar -zxvf cmake-3.16.6.tar.gz && cd cmake-3.16.6 && ./bootstrap && make && make install
-      - name: Build P(NG)Convert
+      - name: Build & Install Dependencies
         run: |
           apt-get update && apt-get install -y -q python python-pip python-dev libpng-dev
           pip install --upgrade conan urllib3
           conan install . --build
+      - name: Build P(NG)Convert
+        run: |
           cmake .
           make
       - name: Test P(NG)Convert
@@ -71,10 +79,12 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Build P(NG)Convert
+      - name: Install Dependencies
         run: |
           pip install --upgrade conan urllib3
           conan install . --build
+      - name: Build P(NG)Convert
+        run: |
           cmake . -DCMAKE_CL_64=1 -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_GENERATOR_PLATFORM=x64 -Ax64 -Wno-dev
           msbuild ALL_BUILD.vcxproj /P:Configuration=Release
       - name: Test P(NG)Convert

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,14 @@
-cmake_minimum_required(VERSION 3.0.0)
-project(pconvert)
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
-
-find_package(PythonLibs)
-
-add_definitions(-DNO_PRAGMA_LIB)
-
-add_executable(pconvert src/pconvert/stdafx.c src/pconvert/pconvert.c src/pconvert/structs.c src/pconvert/util.c src/pconvert/opencl.c)
-
-target_include_directories(pconvert PUBLIC ${PYTHON_INCLUDE_PATH})
-target_link_libraries(pconvert ${CONAN_LIBS} ${PYTHON_LIBRARY})
+cmake_minimum_required(VERSION 3.0.0)
+project(pconvert)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
+find_package(PythonLibs)
+
+add_definitions(-DNO_PRAGMA_LIB)
+
+add_executable(pconvert src/pconvert/stdafx.c src/pconvert/pconvert.c src/pconvert/structs.c src/pconvert/util.c src/pconvert/opencl.c)
+
+target_include_directories(pconvert PUBLIC ${PYTHON_INCLUDE_PATH})
+target_link_libraries(pconvert ${CONAN_LIBS} ${PYTHON_LIBRARY})