From 535e0bf3117362a187ff29d1a7ffdefee7a3de15 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Thu, 23 May 2019 13:51:32 -0500
Subject: [PATCH] streamlined CMAKE setup
---
CMakeLists.txt | 8 +-------
CTP/CMakeLists.txt | 8 ++++----
cmake/simc-config-version.cmake.in | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 638af78..79c7658 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,13 +4,7 @@
## PROJECT: SIMC (Cmake build with file input)
################################################################################
cmake_minimum_required (VERSION 3.5)
-project (simc)
-set (SIMC_MAJOR_VERSION 0)
-set (SIMC_MINOR_VERSION 2)
-set (SIMC_PATCH_VERSION 0)
-set (SIMC_VERSION
- ${SIMC_MAJOR_VERSION}.${SIMC_MINOR_VERSION}.${SIMC_PATCH_VERSION})
-set (SIMC_SOVERSION ${SIMC_MAJOR_VERSION})
+project (simc VERSION 1.0.0)
################################################################################
## CMAKE Settings
diff --git a/CTP/CMakeLists.txt b/CTP/CMakeLists.txt
index 9062184..a8d1ef5 100644
--- a/CTP/CMakeLists.txt
+++ b/CTP/CMakeLists.txt
@@ -74,15 +74,15 @@ add_library(${LIBRARY} STATIC
${CTP_SOURCES}
${RPC_SVC_SOURCE} ${RPC_XDR_SOURCE} ${RPC_HEADER})
set_target_properties(${LIBRARY} PROPERTIES
- VERSION ${SIMC_VERSION}
- SOVERSION ${SIMC_SOVERSION})
+ VERSION ${PROJECT_VERSION}
+ SOVERSION ${PROJECT_MAJOR_VERSION})
add_library(${CLIENT_LIBRARY} STATIC
${CLIENT_SOURCES}
${RPC_CLNT_SOURCE} ${RPC_XDR_SOURCE} ${RPC_HEADER})
set_target_properties(${LIBRARY} PROPERTIES
- VERSION ${SIMC_VERSION}
- SOVERSION ${SIMC_SOVERSION})
+ VERSION ${PROJECT_VERSION}
+ SOVERSION ${PROJECT_MAJOR_VERSION})
add_executable(${PROGRAM} ${MAKEREG_SOURCES})
target_link_libraries(${PROGRAM}
diff --git a/cmake/simc-config-version.cmake.in b/cmake/simc-config-version.cmake.in
index d4ebb08..8610ebf 100644
--- a/cmake/simc-config-version.cmake.in
+++ b/cmake/simc-config-version.cmake.in
@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "@SIMC_VERSION@")
+set(PACKAGE_VERSION "@PROJECT_VERSION@")
# Check whether the requested PACKAGE_FIND_VERSION is compatible
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
--
GitLab