Bladeren bron

Shareed Lib Support
+ BUILD_SHARED_LIBS default OFF
+ Prefer using VERSION on project seeting to seetin _VERSION_MAJOR/MINOR explicitly
+ Check for existing Vendor ID, Device Type, Device Name, Product Code

Bill McCormick 6 jaren geleden
bovenliggende
commit
2952295c9e
2 gewijzigde bestanden met toevoegingen van 10 en 9 verwijderingen
  1. 1 1
      bin/posix/setup_posix.sh
  2. 9 8
      source/CMakeLists.txt

+ 1 - 1
bin/posix/setup_posix.sh

@@ -1,2 +1,2 @@
-cmake -DOpENer_PLATFORM:STRING="POSIX" -DCMAKE_BUILD_TYPE:STRING="" -DBUILD_SHARED_LIBS:BOOL=ON ../../source
+cmake -DOpENer_PLATFORM:STRING="POSIX" -DCMAKE_BUILD_TYPE:STRING="" -DBUILD_SHARED_LIBS:BOOL=OFF ../../source
 
 

+ 9 - 8
source/CMakeLists.txt

@@ -6,24 +6,25 @@ cmake_minimum_required( VERSION 3.3 )
 #######################################
 #######################################
 # Project name                        #
 # Project name                        #
 #######################################
 #######################################
-project( OpENer C )
+project( OpENer LANGUAGES C VERSION 2.3 )
 
 
 #######################################
 #######################################
 # Project version                     #
 # Project version                     #
 #######################################
 #######################################
-if( DEFINED OpENer_Device_Config_Vendor_Id )
-  message("!!!! OpENer_Device_Config_Vendor_Id IS DEFINED !!!!:" ${OpENer_Device_Config_Vendor_Id})
-else()
+
+if( NOT DEFINED OpENer_Device_Config_Vendor_Id )
   set( OpENer_Device_Config_Vendor_Id 1 CACHE STRING "Device Vendor ID" )
   set( OpENer_Device_Config_Vendor_Id 1 CACHE STRING "Device Vendor ID" )
+endif()
+if( NOT DEFINED OpENer_Device_Config_Device_Type )
   set( OpENer_Device_Config_Device_Type 12 CACHE STRING "Device Type ID" )
   set( OpENer_Device_Config_Device_Type 12 CACHE STRING "Device Type ID" )
+endif()
+if( NOT DEFINED OpENer_Device_Config_Product_Code )
   set( OpENer_Device_Config_Product_Code 65001 CACHE STRING "Device Product Code" )
   set( OpENer_Device_Config_Product_Code 65001 CACHE STRING "Device Product Code" )
+endif()
+if( NOT DEFINED OpENer_Device_Config_Device_Name )
   set( OpENer_Device_Config_Device_Name "OpENer PC" CACHE STRING "Device Name" )
   set( OpENer_Device_Config_Device_Name "OpENer PC" CACHE STRING "Device Name" )
-  set( OpENer_VERSION_MAJOR 2 CACHE STRING "Major Version" )
-  set( OpENer_VERSION_MINOR 3 CACHE STRING "Minor Version" )
 endif()
 endif()
 
 
-message("!!!! OpENer_VERSION_MAJOR:" ${OpENer_VERSION_MAJOR})
-
 configure_file(  
 configure_file(  
 	"${PROJECT_SOURCE_DIR}/src/ports/devicedata.h.in"
 	"${PROJECT_SOURCE_DIR}/src/ports/devicedata.h.in"
 	"${PROJECT_BINARY_DIR}/src/ports/devicedata.h"
 	"${PROJECT_BINARY_DIR}/src/ports/devicedata.h"