Skip to content

Commit

Permalink
Added carl prefix to more messages
Browse files Browse the repository at this point in the history
  • Loading branch information
volkm committed Nov 13, 2024
1 parent f7c20b8 commit c25b8ac
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ if (PROJECT_IS_TOP_LEVEL)
endif()

if(APPLE AND ${CMAKE_SYSTEM_PROCESSOR} MATCHES arm64)
message(STATUS "Detected that target system uses Apple Silicon.")
message(WARNING "Compiling natively on Apple Silicon is experimental. Please report issues to [email protected]. For more information visit https://www.stormchecker.org/documentation/obtain-storm/apple-silicon.html")
message(STATUS "carl - Detected that target system uses Apple Silicon.")
message(WARNING "carl - Compiling natively on Apple Silicon is experimental. Please report issues to [email protected]. For more information visit https://www.stormchecker.org/documentation/obtain-storm/apple-silicon.html")
set(APPLE_SILICON 1)
endif()

Expand Down
9 changes: 4 additions & 5 deletions cmake/compiler-options.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Matches "Clang" and "AppleClang"
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
message(FATAL_ERROR " clang version must be at least 3.5!")
message(FATAL_ERROR "carl - Clang version must be at least 3.5!")
endif()
if (APPLE)
message(STATUS "carl - Using clang ${CMAKE_CXX_COMPILER_VERSION} on apple")
set(CMAKE_MACOSX_RPATH 1)
message(STATUS "Using clang ${CMAKE_CXX_COMPILER_VERSION} on Apple")
message(STATUS "carl - Using clang ${CMAKE_CXX_COMPILER_VERSION} on Apple")
set(CMAKE_MACOSX_RPATH 1)
set(CMAKE_MACOSX_RPATH 1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -stdlib=libc++ -pthread")
else()
Expand All @@ -19,7 +18,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Matches "Clang" and "AppleClan
endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
message(FATAL_ERROR " g++ version must be at least 4.9!")
message(FATAL_ERROR "carl - g++ version must be at least 4.9!")
endif()
message(STATUS "carl - Using g++ ${CMAKE_CXX_COMPILER_VERSION}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wunknown-pragmas")
Expand Down
2 changes: 1 addition & 1 deletion resources/addons/addons.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if(BUILD_ADDONS)

if(BUILD_ADDON_PARSER)
if(NOT USE_GINAC)
message(WARNING "Parser addon requires ginac!")
message(WARNING "carl - Parser addon requires ginac!")
endif()
include(resources/addons/carl-parser.cmake)
endif()
Expand Down
6 changes: 0 additions & 6 deletions src/carl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# include directories.
#message(STATUS "Including ${include_dirs}")
#include_directories(
# ${include_dirs}
#)

set(LIB_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

# include util in library.
Expand Down

0 comments on commit c25b8ac

Please sign in to comment.