test CI

.github/workflows/cmake-multi-platform.yml

@@ -6,59 +6,38 @@ on:
 
 jobs:
 
-#  build-linux:
-#    name: 'On Linux'
-#    runs-on: ubuntu-24.04
-#    steps:
-#      - uses: actions/checkout@v1
-#      - name: 'Package installations'
-#        shell: bash
-#        run: |
-#          lsb_release -a
-#          sudo apt update
-#          sudo apt install libeigen3-dev libglfw3-dev libpng-dev libopenmpi-dev libopenexr-dev libimath-dev libinsighttoolkit5-dev libcgal-dev libsuitesparse-dev
-#      - name: 'Trying to compile ASTex on Linux' 
-#        run:  |
-#          mkdir Build
-#          cd Build
-#          cmake ..
-#          cmake --build . 
+  build-linux:
+    name: 'On Linux'
+    runs-on: Ubuntu2404
+    steps:
+      - uses: actions/checkout@v1
+      - name: 'Trying to compile ASTex on Linux' 
+        run:  |
+          mkdir Build
+          cd Build
+          cmake ..
+          cmake --build . --parallel 8
+
+  build-OsX:
+    name: 'On Mac'
+    runs-on: pm_macOs14
+    steps:
+      - uses: actions/checkout@v1
+      - name: 'Trying to compile ASTEx on mac'
+        run: |
+          mkdir Build
+          cd Build
+          cmake ..
+          cmake --build . --parallel 8
 
   build-windows:
     name: 'On Windows'
-    runs-on: windows-2022
-    env: 
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+    runs-on: pm_windows11
     steps:
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
       - uses: actions/checkout@v1
-      - name: 'install deps'
-        run: vcpkg install zlib:x64-windows-release libpng:x64-windows-release eigen3:x64-windows-release
-                        glfw3:x64-windows-release imath:x64-windows-release openexr:x64-windows-release 
-                        itk:x64-windows-release cgal:x64-windows-release suitesparse:x64-windows-release 
-                        glew:x64-windows-release tbb:x64-windows-release 
       - name: 'Trying to compile ASTex on Windows'
         run: |
           mkdir Build
           cd Build
-          cmake .. "-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release"
+          cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake"
           cmake --build .
-
-#  build-OsX:
-#    name: 'On Mac'
-#    runs-on: macos-13
-#    steps:
-#      - uses: actions/checkout@v1
-#      - name: 'install deps'
-#        run: brew install eigen glfw imath openexr openmpi itk cgal suitesparse tbb
-#      - name: 'Trying to compile ASTEx on mac'
-#        run:  |
-#          mkdir Build
-#          cd Build
-#          cmake .. 
-#          cmake --build . # This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.

ASTex/CMakeLists.txt

@@ -6,7 +6,7 @@ find_package(PNG REQUIRED)
 find_package(ITK CONFIG REQUIRED)
 include(${ITK_USE_FILE})
 find_package(OpenMP)
-find_package(OpenMP)
+
 
 find_package(Eigen3 REQUIRED)
 
@@ -16,16 +16,18 @@ if(NOT TARGET Imath::Imath)
 endif()
 find_package(OpenEXR CONFIG REQUIRED)
 
+
+add_library( ${PROJECT_NAME} )
+
+
 if(__APPLE__)
 	find_library(CORE_FOUNDATION CoreFoundation)
 	find_library(CARBON Carbon)
 	set (APPLE_LINK "${CORE_FOUNDATION} ${CARBON}")
+	target_include_directories(${PROJECT_NAME} BEFORE PUBLIC /usr/local/includeà)
+	target_link_directories (${PROJECT_NAME} PUBLIC /usr/local/lib)
 endif()
 
-
-add_library( ${PROJECT_NAME} )
-
-
 target_sources (${PROJECT_NAME} PRIVATE 
 	internal.h
 	image_common.h
@@ -123,7 +125,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include> $
 
 
 
-set ( ASTEX_LIBRARIES ${ITK_LIBRARIES} ${FFTW_LIBRARIES} ${PNG_LIBRARIES} ${APPLE_LINK})
+set ( ASTEX_LIBRARIES ${ITK_LIBRARIES} ${FFTW_LIBRARIES} ${PNG_LIBRARIES} ${APPLE_LINK} )
 
 # if (NOT(MSVC OR APPLE))
 #   target_compile_options(${PROJECT_NAME} PUBLIC -pthread)
@@ -134,6 +136,9 @@ if(OpenMP_CXX_FOUND)
 endif()
 
 if(MSVC)
+	target_include_directories (${PROJECT_NAME} PUBLIC ${VCPKG_INSTALLED_DIR}/include)
+	target_link_directories (${PROJECT_NAME} PUBLIC ${VCPKG_INSTALLED_DIR}/lib)
+
 	target_compile_definitions(${PROJECT_NAME} PUBLIC -D_USE_MATH_DEFINES -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_SECURE_SCL=0 -D_SECURE_SCL_THROWS=0)
 	if(${BUILD_SHARED_LIBS})
 		target_compile_definitions(${PROJECT_NAME} PRIVATE "-DASTEX_DLL_EXPORT")
@@ -173,6 +178,7 @@ target_link_libraries (${PROJECT_NAME} PUBLIC
     )
 
 
+
 file(GLOB HEADERS "." "*.h" "*.hpp")
 install(FILES ${HEADERS} DESTINATION include/ASTex/)
 install(FILES "${ASTEX_SOURCE_DIR}/cmake/FindOpenEXR.cmake" "${ASTEX_SOURCE_DIR}/cmake/FindFFTW.cmake" DESTINATION lib/cmake/ASTex/)

Algo/BLTS/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(LRPN LANGUAGES CXX)
 
-#find_package(ASTex)  ## done outside
+find_package(ASTex)  ## done outside
 
 add_definitions(-DTEMPO_PATH=std::string\(\"${ASTEX_TEMPO_PATH}/\"\) )
 

Algo/CCVT_CGAL/CMakeLists.txt

@@ -8,6 +8,9 @@ find_package(glfw3 3.3 REQUIRED)
 find_package(OpenGL REQUIRED)
 
 if (WIN32)
+       target_include_directories (${PROJECT_NAME} PUBLIC ${VCPKG_INSTALLED_DIR}/include)
+       target_link_directories (${PROJECT_NAME} PUBLIC ${VCPKG_INSTALLED_DIR}/lib)
+
 	find_package(GLEW CONFIG REQUIRED)
 	find_package(metis CONFIG REQUIRED)
 	find_package(BLAS REQUIRED)
@@ -60,17 +63,17 @@ set(SRCS main_ccvt_cgal.cpp
         ccvt_sites.cpp
         ccvt_application.cpp)
 
-add_executable(ccvt_cgal_chgrenier )
+add_executable(${PROJECT_NAME} )
 
-target_sources(ccvt_cgal_chgrenier PRIVATE ${SRCS} main_ccvt_cgal.cpp)
+target_sources(${PROJECT_NAME} PRIVATE ${SRCS} main_ccvt_cgal.cpp)
 
-target_include_directories(ccvt_cgal_chgrenier PRIVATE 
+target_include_directories(${PROJECT_NAME} PRIVATE 
 				/usr/include/suitesparse
 				/usr/local/include/suitesparse)
 
-target_link_directories(ccvt_cgal_chgrenier PRIVATE /usr/local/lib/)
+target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/lib/)
 
-target_link_libraries(ccvt_cgal_chgrenier PRIVATE
+target_link_libraries(${PROJECT_NAME} PRIVATE
         CGAL::CGAL
         ${SUITESPARSE_LIBRARIES}
         glfw
@@ -79,22 +82,24 @@ target_link_libraries(ccvt_cgal_chgrenier PRIVATE
 	${GLEW_LIBRARIES} )
 
 
+       target_include_directories (${PROJECT_NAME} PUBLIC /usr/local/include)
+       target_link_directories (${PROJECT_NAME} PUBLIC /usr/local/lib)
 
-target_compile_features(ccvt_cgal_chgrenier PUBLIC cxx_std_17)
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
 
-cgal_add_compilation_test(ccvt_cgal_chgrenier)
+cgal_add_compilation_test(${PROJECT_NAME})
 
 # nice vs solution
-set_target_properties(ccvt_cgal_chgrenier PROPERTIES FOLDER Algo)
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Algo)
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/shaders DESTINATION "${ASTEX_TEMPO_PATH}")
 
 
-#install(TARGETS ccvt_cgal_chgrenier
+#install(TARGETS ${PROJECT_NAME}
 #        COMPONENT ink_edit_comp
 #        DESTINATION ink_edit
 #)
-#install(IMPORTED_RUNTIME_ARTIFACTS ccvt_cgal_chgrenier
+#install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT_NAME}
 #        RUNTIME_DEPENDENCY_SET ink_edit_dep
 #        RUNTIME
 #        COMPONENT ink_edit_comp
@@ -111,7 +116,7 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/shaders DESTINATION "${ASTEX_TEMPO_PATH}")
 #install(CODE [[
 #        file(GET_RUNTIME_DEPENDENCIES
 #            RESOLVED_DEPENDENCIES_VAR ink_edit_dep_var
-#            EXECUTABLES $<TARGET_FILE:ccvt_cgal_chgrenier>
+#            EXECUTABLES $<TARGET_FILE:${PROJECT_NAME}>
 #        )
 #        MESSAGE(STATUS "blabla ${ink_edit_dep_var}")
 #        file(INSTALL ${ink_edit_dep_var}
@@ -125,4 +130,4 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/shaders DESTINATION "${ASTEX_TEMPO_PATH}")
 #        DESTINATION ink_edit/lib
 #)
 
-set_target_properties(ccvt_cgal_chgrenier PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH $ORIGIN/lib)

Algo/CCVT_CGAL/ccvt_application.cpp

@@ -6,7 +6,7 @@
 #include "timer.h"
 
 #include <GL/glew.h>
-#include <GL/gl.h>
+//#include <GL/gl.h>
 #include <GLFW/glfw3.h>
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
@@ -1209,4 +1209,4 @@ void ccvt_application::computeProportions() {
 
 
     m_histo=histo;
-}
+}

Algo/CyclostationaryNoise/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(PatchExchange LANGUAGES CXX)
 
-#find_package(ASTex)  ## done outside
+find_package(ASTex)  ## done outside
 
 add_executable(cyclostationary_noise "")
 

Algo/Graphcut/CMakeLists.txt

@@ -1,17 +1,15 @@
-cmake_minimum_required(VERSION 3.5)
-
 project(Graphcut)
 
 add_definitions(-DTEMPO_PATH=std::string\(\"${ASTEX_TEMPO_PATH}/\"\) )
 
 
-#find_package(ASTex)  ## done outside
+find_package(ASTex)  ## done outside
 
-add_executable(test_graphcut "")
+add_executable(test_graphcut)
 target_sources(test_graphcut PRIVATE test_graphcut.cpp graphcut.h graphcut.cpp maxflow/block.h maxflow/graph.h maxflow/graph.cpp maxflow/maxflow.cpp)
 target_link_libraries(test_graphcut PRIVATE ASTex)
 
-add_executable(test_graphcut_2 "")
+add_executable(test_graphcut_2 )
 target_sources(test_graphcut_2 PRIVATE test_graphcut_2.cpp graphcut.h graphcut.cpp maxflow/block.h maxflow/graph.h maxflow/graph.cpp maxflow/maxflow.cpp)
 target_link_libraries(test_graphcut_2 PRIVATE ASTex)
 

Algo/PatchExchange/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(PatchExchange LANGUAGES CXX)
 
-#find_package(ASTex)  ## done outside
+find_package(ASTex)  ## done outside
 
 add_executable(test_patch_exchange "")