From 1ac5e7f1180b60dcc89c67ad38e0cb93ec407622 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 27 Apr 2018 19:35:45 +0200 Subject: [PATCH] Updated CMake settings --- .cproject | 21 +++++++++++++------ .settings/language.settings.xml | 4 ++-- .../org.eclipse.cdt.managedbuilder.core.prefs | 13 ++++++++++++ CMakeLists.txt | 6 +++++- cmake/Conan.cmake | 2 +- examples/simple_system/CMakeLists.txt | 19 +---------------- examples/transaction_recording/CMakeLists.txt | 4 +++- sc-components | 2 +- 8 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 .settings/org.eclipse.cdt.managedbuilder.core.prefs diff --git a/.cproject b/.cproject index a773b5e..3c33963 100644 --- a/.cproject +++ b/.cproject @@ -7,19 +7,17 @@ - - - + - + - + + + + + + + + + + + + @@ -80,7 +89,7 @@ - + diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index aab43e1..f30c078 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/.settings/org.eclipse.cdt.managedbuilder.core.prefs new file mode 100644 index 0000000..75aa130 --- /dev/null +++ b/.settings/org.eclipse.cdt.managedbuilder.core.prefs @@ -0,0 +1,13 @@ +eclipse.preferences.version=1 +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/CPATH/delimiter=\: +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/CPATH/operation=remove +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/CPLUS_INCLUDE_PATH/delimiter=\: +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/CPLUS_INCLUDE_PATH/operation=remove +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/C_INCLUDE_PATH/delimiter=\: +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/C_INCLUDE_PATH/operation=remove +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/append=true +environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/appendContributed=true +environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/LIBRARY_PATH/delimiter=\: +environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/LIBRARY_PATH/operation=remove +environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/append=true +environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.macosx.exe.debug.133691581/appendContributed=true diff --git a/CMakeLists.txt b/CMakeLists.txt index c126648..a892301 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 3.3) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake) +set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} + ${CMAKE_CURRENT_SOURCE_DIR}/cmake + ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake +) include(GitFunctions) get_branch_from_git() diff --git a/cmake/Conan.cmake b/cmake/Conan.cmake index cfbf2d4..5bd9930 100644 --- a/cmake/Conan.cmake +++ b/cmake/Conan.cmake @@ -41,5 +41,5 @@ macro(setup_conan) endif() include(${conanfile_cmake}) - conan_basic_setup(TARGETS) + conan_basic_setup() endmacro() diff --git a/examples/simple_system/CMakeLists.txt b/examples/simple_system/CMakeLists.txt index c0ce4c1..ee736bf 100644 --- a/examples/simple_system/CMakeLists.txt +++ b/examples/simple_system/CMakeLists.txt @@ -1,20 +1,4 @@ -#------------------------------------------------------------------------------- -# Copyright 2017 eyck@minres.com -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy -# of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. -#------------------------------------------------------------------------------- -cmake_minimum_required (VERSION 2.8.12) - +cmake_minimum_required(VERSION 3.3) # Add executable called "simple_system" that is built from the source files # "scv_tr_recording_example.cpp". The extensions are automatically found. add_executable (simple_system @@ -26,7 +10,6 @@ add_executable (simple_system simple_system.cpp sc_main.cpp ) - # Link the executable to the sc_components library. Since the sc_components library has # public include directories we will use those link directories when building # simple_system diff --git a/examples/transaction_recording/CMakeLists.txt b/examples/transaction_recording/CMakeLists.txt index de77be7..bfcbd5a 100644 --- a/examples/transaction_recording/CMakeLists.txt +++ b/examples/transaction_recording/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 3.3) # Add executable called "transaction_recording" that is built from the source files # "scv_tr_recording_example.cpp". The extensions are automatically found. -add_executable (transaction_recording scv_tr_recording_example.cpp) +add_executable (transaction_recording + scv_tr_recording_example.cpp +) # Link the executable to the sc_components library. Since the sc_components library has # public include directories we will use those link directories when building # transaction_recording diff --git a/sc-components b/sc-components index d4653d0..bab66d1 160000 --- a/sc-components +++ b/sc-components @@ -1 +1 @@ -Subproject commit d4653d028cec23a4d2ab63f1c213ac627393c7cf +Subproject commit bab66d1744221fdce7d0634c08c5c21184539d2a