Skip to content

Commit 6ad1a81

Browse files
committed
cmake: update supercollider version handling
cpack version should be set directly from the project version
1 parent 945e87e commit 6ad1a81

1 file changed

Lines changed: 14 additions & 20 deletions

File tree

CMakeLists.txt

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
cmake_minimum_required (VERSION 3.12)
2-
project (sc3-plugins)
2+
3+
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules
4+
${CMAKE_MODULE_PATH})
5+
6+
find_package(SuperCollider3)
7+
if (NOT SC_FOUND)
8+
message(SEND_ERROR "cannot find SuperCollider3 headers. Set the variable SC_PATH.")
9+
else()
10+
message(STATUS "Using SC source located at ${SC_PATH}")
11+
endif()
12+
13+
include("${SC_PATH}/SCVersion.txt")
14+
project (sc3-plugins VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})
15+
message(STATUS "Building plugins for SuperCollider version: ${SC_VERSION}")
316

417
set(NOVA_SIMD_MISSING_ERROR "The nova-simd source code is missing in \
518
${CMAKE_CURRENT_SOURCE_DIR}/external_libraries/nova-simd.\n This probably \
@@ -21,9 +34,6 @@ if (NOT SYSTEM_STK)
2134
endif()
2235
endif()
2336

24-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules
25-
${CMAKE_MODULE_PATH})
26-
2737
configure_file(
2838
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/cmake_uninstall.cmake.in"
2939
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
@@ -32,13 +42,6 @@ configure_file(
3242
add_custom_target(uninstall
3343
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
3444

35-
find_package(SuperCollider3)
36-
if (NOT SC_FOUND)
37-
message(SEND_ERROR "cannot find SuperCollider3 headers. Set the variable SC_PATH.")
38-
else()
39-
message(STATUS "Using SC source located at ${SC_PATH}")
40-
endif()
41-
4245
set(NOVA_TT_MISSING_ERROR "The nova-tt source code is missing in \
4346
${SC_PATH}/external_libraries/nova-tt.\n Make sure to point to a valid version \
4447
of SuperCollider's source code (with the help of the SC_PATH variable).\n It's \
@@ -52,10 +55,6 @@ if (NOVA_DISK_IO)
5255
endif()
5356
endif()
5457

55-
include("${SC_PATH}/SCVersion.txt")
56-
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}")
57-
message(STATUS "Building plugins for SuperCollider version: ${PROJECT_VERSION}")
58-
5958
option(SUPERNOVA "Build plugins for supernova" ON)
6059

6160
option(AY "Build with AY ugens" ON)
@@ -230,11 +229,6 @@ endif()
230229
#############################################
231230
# CPack support
232231

233-
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
234-
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
235-
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
236-
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
237-
238232
if(WIN32)
239233
set(CPACK_GENERATOR ZIP)
240234
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)

0 commit comments

Comments
 (0)