Skip to content
Snippets Groups Projects
Commit e90934c4 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

CMake: Uniform lowercase in CMake commands

parent 0f229f1e
No related branches found
No related tags found
No related merge requests found
...@@ -121,14 +121,14 @@ endif() ...@@ -121,14 +121,14 @@ endif()
if(WIN32) if(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
endif() endif()
# --- making library --------- # --- making library ---------
add_library(${library_name} SHARED ${include_files} ${source_files}) add_library(${library_name} SHARED ${include_files} ${source_files})
set_Target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
...@@ -194,7 +194,7 @@ install (FILES ${CMAKE_SOURCE_DIR}/Wrap/WinDllMacros.h DESTINATION ${destination ...@@ -194,7 +194,7 @@ install (FILES ${CMAKE_SOURCE_DIR}/Wrap/WinDllMacros.h DESTINATION ${destination
if(WIN32) if(WIN32)
# python in windows required .pyd extention for the library name # python in windows required .pyd extention for the library name
if(BORNAGAIN_PYTHON) if(BORNAGAIN_PYTHON)
ADD_CUSTOM_COMMAND( add_custom_command(
TARGET ${library_name} TARGET ${library_name}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
...@@ -202,7 +202,7 @@ if(WIN32) ...@@ -202,7 +202,7 @@ if(WIN32)
${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}".pyd" ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}".pyd"
) )
install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION ${destination_lib} COMPONENT Libraries) install(FILES ${CMAKE_BINARY_DIR}/lib/${libprefix}${library_name}.pyd DESTINATION ${destination_lib} COMPONENT Libraries)
ADD_CUSTOM_COMMAND( add_custom_command(
TARGET ${library_name} TARGET ${library_name}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
...@@ -212,13 +212,13 @@ if(WIN32) ...@@ -212,13 +212,13 @@ if(WIN32)
endif() endif()
# system libraries # system libraries
FOREACH(Boost_lib ${Boost_LIBRARIES}) foreach(Boost_lib ${Boost_LIBRARIES})
get_filename_component(UTF_BASE_NAME ${Boost_lib} NAME_WE) get_filename_component(UTF_BASE_NAME ${Boost_lib} NAME_WE)
get_filename_component(UTF_PATH ${Boost_lib} PATH) get_filename_component(UTF_PATH ${Boost_lib} PATH)
message(STATUS "Boost dll: ${UTF_PATH}/${UTF_BASE_NAME}.dll") message(STATUS "Boost dll: ${UTF_PATH}/${UTF_BASE_NAME}.dll")
install(FILES ${UTF_PATH}/${UTF_BASE_NAME}.dll install(FILES ${UTF_PATH}/${UTF_BASE_NAME}.dll
DESTINATION ${destination_lib} COMPONENT Libraries) DESTINATION ${destination_lib} COMPONENT Libraries)
ENDFOREACH() endforeach()
get_filename_component(UTF_BASE_NAME ${PYTHON_LIBRARIES} NAME_WE) get_filename_component(UTF_BASE_NAME ${PYTHON_LIBRARIES} NAME_WE)
get_filename_component(UTF_PATH ${PYTHON_EXECUTABLE} PATH) get_filename_component(UTF_PATH ${PYTHON_EXECUTABLE} PATH)
......
...@@ -87,12 +87,12 @@ endif() ...@@ -87,12 +87,12 @@ endif()
# --- definitions --------- # --- definitions ---------
if(WIN32) if(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
endif() endif()
# --- making library --------- # --- making library ---------
add_library(${library_name} SHARED ${include_files} ${source_files}) add_library(${library_name} SHARED ${include_files} ${source_files})
set_Target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
if(BORNAGAIN_PYTHON) if(BORNAGAIN_PYTHON)
......
project (ba3d) project(ba3d)
cmake_minimum_required (VERSION 3.1 FATAL_ERROR) cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
if(POLICY CMP0071) if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
endif() endif()
set (CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
if (CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
add_compile_options(-Wall -Wextra -Wpedantic) add_compile_options(-Wall -Wextra -Wpedantic)
endif () endif()
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL) find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
if (${Qt5Core_VERSION} VERSION_LESS "5.5.1") if(${Qt5Core_VERSION} VERSION_LESS "5.5.1")
message (FATAL_ERROR "Qt 5.5.1+ is required, have ${Qt5Core_VERSION_STRING}") message (FATAL_ERROR "Qt 5.5.1+ is required, have ${Qt5Core_VERSION_STRING}")
endif () endif()
set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR}) set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${include_dirs}) include_directories(${include_dirs})
set (CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
add_subdirectory (ba3d) add_subdirectory (ba3d)
add_subdirectory (showcase) add_subdirectory (showcase)
......
set (app ba3d_showcase) set(app ba3d_showcase)
find_package (Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
find_package (Qt5Gui REQUIRED) find_package(Qt5Gui REQUIRED)
find_package (Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
find_package (OpenGL) find_package(OpenGL)
file (GLOB_RECURSE files *) file(GLOB_RECURSE files *)
add_executable (${app} ${files}) add_executable(${app} ${files})
target_link_libraries (${app} target_link_libraries(${app}
ba3d ba3d
Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Widgets
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
......
...@@ -80,7 +80,7 @@ if(BORNAGAIN_CRASHHANDLER) ...@@ -80,7 +80,7 @@ if(BORNAGAIN_CRASHHANDLER)
endif() endif()
if(WIN32) if(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
endif() endif()
...@@ -119,7 +119,7 @@ install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Librar ...@@ -119,7 +119,7 @@ install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Librar
if(WIN32) if(WIN32)
# --- Qt --- # --- Qt ---
STRING(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR} ) # Convert C:\Qt\ to C:/Qt/ string(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR} ) # Convert C:\Qt\ to C:/Qt/
install(FILES install(FILES
${QTDIR}/bin/Qt5Widgets.DLL ${QTDIR}/bin/Qt5Widgets.DLL
${QTDIR}/bin/Qt5Core.dll ${QTDIR}/bin/Qt5Core.dll
......
...@@ -8,7 +8,7 @@ file(GLOB source_files "*.cpp") ...@@ -8,7 +8,7 @@ file(GLOB source_files "*.cpp")
file(GLOB include_files "*.h") file(GLOB include_files "*.h")
if(WIN32) if(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
endif() endif()
# --- making library --------- # --- making library ---------
...@@ -18,7 +18,7 @@ add_library( ...@@ -18,7 +18,7 @@ add_library(
${source_files} ${include_files} ${source_files} ${include_files}
) )
set_Target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
# exposing library name and list of include directories outside # exposing library name and list of include directories outside
......
...@@ -15,9 +15,9 @@ file(GLOB include_files "*.h") ...@@ -15,9 +15,9 @@ file(GLOB include_files "*.h")
add_definitions(-DWARNINGMSG) add_definitions(-DWARNINGMSG)
if(NOT WIN32) if(NOT WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
else() else()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
endif() endif()
# --- making library ------------ # --- making library ------------
......
...@@ -33,9 +33,9 @@ file(GLOB include_files ...@@ -33,9 +33,9 @@ file(GLOB include_files
add_definitions(-DWARNINGMSG) add_definitions(-DWARNINGMSG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE")
if(NOT WIN32) if(NOT WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
else() else()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
endif() endif()
# --- making library ------------ # --- making library ------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment