Update cmake tools.

kovacsv · Dec 23, 2023 · 3533870 · 3533870
1 parent b34bec2
commit 3533870
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Run build script
         run: |
-          python Tools/BuildAddOn.py --configFile config.json --acVersion ${{ matrix.ac-version }} --release --package
+          python Tools/BuildAddOn.py --configFile config.json --acVersion ${{ matrix.ac-version }} --package
 
       - name: Create Release
         if: startsWith(github.ref, 'refs/tags/')

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,12 +11,15 @@ set (AC_API_DEVKIT_DIR ${API_DEVKIT_DIR} CACHE PATH "API DevKit directory.")
 set (AC_ADDON_NAME "DotbimAddOn" CACHE STRING "Add-On name.")
 set (AC_ADDON_LANGUAGE "INT" CACHE STRING "Add-On language code.")
 
-project (${AC_ADDON_NAME})
+if (NOT DEFINED AC_VERSION)
+    message (FATAL_ERROR "AC_VERSION is not set!")
+endif ()
+
+message (STATUS "Archicad Version: ${AC_VERSION}")
+SetGlobalCompilerDefinitions (${AC_VERSION})
 
-DetectACVersion (${AC_API_DEVKIT_DIR} ACVersion)
-message (STATUS "Archicad Version: ${ACVersion}")
+project (${AC_ADDON_NAME})
 
 set (AddOnSourcesFolder Source)
 set (AddOnResourcesFolder .)
-SetGlobalCompilerDefinitions ()
-GenerateAddOnProject (${ACVersion} ${AC_API_DEVKIT_DIR} ${AC_ADDON_NAME} ${AddOnSourcesFolder} ${AddOnResourcesFolder} ${AC_ADDON_LANGUAGE})
+GenerateAddOnProject (${AC_VERSION} ${AC_API_DEVKIT_DIR} ${AC_ADDON_NAME} ${AddOnSourcesFolder} ${AddOnResourcesFolder} ${AC_ADDON_LANGUAGE})
diff --git a/Tools b/Tools
diff --git a/config.json b/config.json
@@ -1,17 +1,6 @@
 {
     "addOnName": "DotbimAddOn",
-    "devKitLinks": {
-        "WIN": {
-            "27": "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/27.3001/API.Development.Kit.WIN.27.3001.zip",
-            "26": "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/26.3000/API.Development.Kit.WIN.26.3000.zip",
-            "25": "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/25.3002/API.Development.Kit.WIN.25.3002.zip"
-        },
-        "MAC": {
-            "27": "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/27.3001/API.Development.Kit.MAC.27.3001.zip",
-            "26": "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/26.3000/API.Development.Kit.MAC.26.3000.zip",
-            "25": "https://github.com/GRAPHISOFT/archicad-api-devkit/releases/download/25.3002/API.Development.Kit.MAC.25.3002.zip"
-        }
-    },
+    "defaultLanguage": "INT",
     "languages": [
         "INT"
     ]
+12 −0		APIDevKitLinks.json
+85 −90		BuildAddOn.py
+15 −22		CMakeCommon.cmake
+16 −0		README.md