Lower-case CMake commands.

betachen · Jun 12, 2016 · e409980 · e409980
1 parent bfff024
commit e409980
Show file tree

Hide file tree

Showing 24 changed files with 281 additions and 281 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,116 +13,116 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
-PROJECT(swirlyc)
+cmake_minimum_required(VERSION 3.0)
+project(swirlyc)
 
-SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/etc")
-SET(CMAKE_VERBOSE_MAKEFILE 1)
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/etc")
+set(CMAKE_VERBOSE_MAKEFILE 1)
 
 # Configuration options:
-SET(ENABLE_SHARED_LIBS ON  CACHE BOOL   "Enable shared libs.")
-SET(MG_ENABLE_DEBUG    OFF CACHE BOOL   "Enable Mongoose debug.")
-SET(SWIRLY_DEPTH       3   CACHE STRING "Depth of book.")
+set(ENABLE_SHARED_LIBS ON  CACHE BOOL   "Enable shared libs.")
+set(MG_ENABLE_DEBUG    OFF CACHE BOOL   "Enable Mongoose debug.")
+set(SWIRLY_DEPTH       3   CACHE STRING "Depth of book.")
 
-IF(NOT CMAKE_BUILD_TYPE)
-  #SET(CMAKE_BUILD_TYPE DEBUG)
-  #SET(CMAKE_BUILD_TYPE RELEASE)
-  SET(CMAKE_BUILD_TYPE RELWITHDEBINFO)
-  #SET(CMAKE_BUILD_TYPE MINSIZEREL)
-ENDIF()
+if(NOT CMAKE_BUILD_TYPE)
+  #set(CMAKE_BUILD_TYPE DEBUG)
+  #set(CMAKE_BUILD_TYPE RELEASE)
+  set(CMAKE_BUILD_TYPE RELWITHDEBINFO)
+  #set(CMAKE_BUILD_TYPE MINSIZEREL)
+endif()
 
 # Enable for use with clang-tidy.
-IF(NOT CMAKE_EXPORT_COMPILE_COMMANDS)
-  SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-ENDIF()
+if(NOT CMAKE_EXPORT_COMPILE_COMMANDS)
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+endif()
 
-STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
+string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
 
-SET(COMMON_WARN "-Wall -Werror -Wextra -Wstrict-aliasing=2 -Wno-unused-parameter -Wno-unused-variable")
-SET(COMMON_FLAGS "-fstrict-aliasing -fvisibility=hidden")
+set(COMMON_WARN "-Wall -Werror -Wextra -Wstrict-aliasing=2 -Wno-unused-parameter -Wno-unused-variable")
+set(COMMON_FLAGS "-fstrict-aliasing -fvisibility=hidden")
 
-IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS} ${COMMON_WARN}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ${COMMON_FLAGS} ${COMMON_WARN} -fno-enforce-eh-specs -fnothrow-opt -fno-rtti")
-ELSEIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS} ${COMMON_WARN}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ${COMMON_FLAGS} ${COMMON_WARN} -fno-rtti")
-ENDIF()
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS} ${COMMON_WARN}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ${COMMON_FLAGS} ${COMMON_WARN} -fno-enforce-eh-specs -fnothrow-opt -fno-rtti")
+elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${COMMON_FLAGS} ${COMMON_WARN}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 ${COMMON_FLAGS} ${COMMON_WARN} -fno-rtti")
+endif()
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 
-ADD_DEFINITIONS(-DSWIRLY_DEPTH=${SWIRLY_DEPTH})
+add_definitions(-DSWIRLY_DEPTH=${SWIRLY_DEPTH})
 
-ADD_DEFINITIONS(-DBOOST_NO_AUTO_PTR=1 -DBOOST_NO_RTTI=1 -DBOOST_NO_TYPEID=1)
-IF(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-  ADD_DEFINITIONS(-DSWIRLY_ENABLE_DEBUG=1)
-ENDIF()
+add_definitions(-DBOOST_NO_AUTO_PTR=1 -DBOOST_NO_RTTI=1 -DBOOST_NO_TYPEID=1)
+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+  add_definitions(-DSWIRLY_ENABLE_DEBUG=1)
+endif()
 
-SET(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
-SET(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
+set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib")
 
-FILE(MAKE_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
-FILE(MAKE_DIRECTORY "${LIBRARY_OUTPUT_PATH}")
-FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/share/doc/html")
+file(MAKE_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
+file(MAKE_DIRECTORY "${LIBRARY_OUTPUT_PATH}")
+file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/share/doc/html")
 
-SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/etc")
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/etc")
 
-FIND_PROGRAM(DOT_EXECUTABLE dot)
-FIND_PROGRAM(ENV_EXECUTABLE env)
-FIND_PROGRAM(RAGEL_EXECUTABLE ragel)
+find_program(DOT_EXECUTABLE dot)
+find_program(ENV_EXECUTABLE env)
+find_program(RAGEL_EXECUTABLE ragel)
 
-FIND_PACKAGE(Boost   1.55  REQUIRED COMPONENTS date_time filesystem system)
+find_package(Boost   1.55  REQUIRED COMPONENTS date_time filesystem system)
 # The sqlite3_errstr() function was added in 3.7.15.
-FIND_PACKAGE(SQLite3 3.7.15 REQUIRED)
+find_package(SQLite3 3.7.15 REQUIRED)
 
-FIND_PACKAGE(Doxygen)                # Optional.
-FIND_PACKAGE(Perl)                   # Optional.
-FIND_PACKAGE(PythonInterp 2.7 EXACT) # Optional.
+find_package(Doxygen)                # Optional.
+find_package(Perl)                   # Optional.
+find_package(PythonInterp 2.7 EXACT) # Optional.
 
-IF(DOXYGEN_FOUND)
+if(DOXYGEN_FOUND)
 
-  CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/Doxyfile.in"
+  configure_file("${PROJECT_SOURCE_DIR}/Doxyfile.in"
     "${PROJECT_BINARY_DIR}/Doxyfile")
 
-  ADD_CUSTOM_TARGET(doc
+  add_custom_target(doc
     WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
     COMMAND "${CMAKE_COMMAND}" -E make_directory "${PROJECT_BINARY_DIR}/share"
     COMMAND "${DOXYGEN_EXECUTABLE}" "${PROJECT_BINARY_DIR}/Doxyfile"
     SOURCES "${PROJECT_BINARY_DIR}/Doxyfile")
 
-  ADD_CUSTOM_COMMAND(TARGET doc POST_BUILD
+  add_custom_command(TARGET doc POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/CNAME"
             "${PROJECT_BINARY_DIR}/share/doc/html/")
-  ADD_DEPENDENCIES(doc image)
-
-  INSTALL(DIRECTORY "${PROJECT_BINARY_DIR}/share/doc/" DESTINATION share/doc)
-ENDIF()
-
-INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}")
-INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/contrib")
-INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/include")
-
-IF(ENABLE_SHARED_LIBS)
-  SET(ash_LIBRARY ash_shared)
-  SET(elm_LIBRARY elm_shared)
-  SET(fig_LIBRARY fig_shared)
-  SET(fir_LIBRARY fir_shared)
-  SET(tea_LIBRARY tea_shared)
-  SET(sqlite_LIBRARY sqlite_shared)
-ELSE()
-  SET(ash_LIBRARY ash_static)
-  SET(elm_LIBRARY elm_static)
-  SET(fig_LIBRARY fig_static)
-  SET(fir_LIBRARY fir_static)
-  SET(tea_LIBRARY tea_static)
-  SET(sqlite_LIBRARY sqlite_static)
-ENDIF()
-
-ENABLE_TESTING()
-
-ADD_SUBDIRECTORY(db)
-ADD_SUBDIRECTORY(etc)
-ADD_SUBDIRECTORY(image)
-ADD_SUBDIRECTORY(include)
-ADD_SUBDIRECTORY(src)
-
-ADD_SUBDIRECTORY(test)
+  add_dependencies(doc image)
+
+  install(DIRECTORY "${PROJECT_BINARY_DIR}/share/doc/" DESTINATION share/doc)
+endif()
+
+include_directories("${Boost_INCLUDE_DIRS}")
+include_directories("${PROJECT_SOURCE_DIR}/contrib")
+include_directories("${PROJECT_SOURCE_DIR}/include")
+
+if(ENABLE_SHARED_LIBS)
+  set(ash_LIBRARY ash_shared)
+  set(elm_LIBRARY elm_shared)
+  set(fig_LIBRARY fig_shared)
+  set(fir_LIBRARY fir_shared)
+  set(tea_LIBRARY tea_shared)
+  set(sqlite_LIBRARY sqlite_shared)
+else()
+  set(ash_LIBRARY ash_static)
+  set(elm_LIBRARY elm_static)
+  set(fig_LIBRARY fig_static)
+  set(fir_LIBRARY fir_static)
+  set(tea_LIBRARY tea_static)
+  set(sqlite_LIBRARY sqlite_static)
+endif()
+
+enable_testing()
+
+add_subdirectory(db)
+add_subdirectory(etc)
+add_subdirectory(image)
+add_subdirectory(include)
+add_subdirectory(src)
+
+add_subdirectory(test)
diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
@@ -13,39 +13,39 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-INCLUDE(AddFileDependencies)
+include(AddFileDependencies)
 
-SET(dbfiles)
-IF(SQLITE3_EXECUTABLE)
+set(dbfiles)
+if(SQLITE3_EXECUTABLE)
 
-  MESSAGE(STATUS "Sqlite3 found: ${SQLITE3_EXECUTABLE}")
+  message(STATUS "Sqlite3 found: ${SQLITE3_EXECUTABLE}")
 
-  SET(names
+  set(names
     coal
     coffee
     corp
     forex
   )
 
-  FOREACH(name ${names})
+  foreach(name ${names})
 
-    SET(dbfile "${PROJECT_BINARY_DIR}/db/${name}.db")
+    set(dbfile "${PROJECT_BINARY_DIR}/db/${name}.db")
 
-    ADD_CUSTOM_COMMAND(
+    add_custom_command(
       OUTPUT "${dbfile}"
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
       COMMAND ${CMAKE_COMMAND} -E remove "${dbfile}"
       COMMAND "${SQLITE3_EXECUTABLE}" "${dbfile}" <schema.sql
       COMMAND "${SQLITE3_EXECUTABLE}" "${dbfile}" <${name}.sql
       DEPENDS schema.sql ${name}.sql)
 
-    SET(dbfiles ${dbfiles} "${dbfile}")
-  ENDFOREACH()
+    set(dbfiles ${dbfiles} "${dbfile}")
+  endforeach()
 
-ENDIF()
+endif()
 
-ADD_CUSTOM_TARGET(db ALL DEPENDS ${dbfiles})
+add_custom_target(db ALL DEPENDS ${dbfiles})
 
-FILE(GLOB sqlfiles "*.sql")
-INSTALL(FILES ${sqlfiles}  DESTINATION db)
-INSTALL(FILES ${dbfiles} DESTINATION db)
+file(GLOB sqlfiles "*.sql")
+install(FILES ${sqlfiles}  DESTINATION db)
+install(FILES ${dbfiles} DESTINATION db)
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
@@ -13,10 +13,10 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-SET(etc_FILES
+set(etc_FILES
   FindSQLite3.cmake
   FindSwirly.cmake
   swirlyd.conf
 )
 
-INSTALL(FILES ${etc_FILES} DESTINATION etc)
+install(FILES ${etc_FILES} DESTINATION etc)
diff --git a/example/helloworld/CMakeLists.txt b/example/helloworld/CMakeLists.txt
@@ -13,24 +13,24 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
-PROJECT(helloworld)
+cmake_minimum_required(VERSION 3.0)
+project(helloworld)
 
-IF(DEFINED ENV{SWIRLY_HOME})
-  MESSAGE("SWIRLY_HOME is set to $ENV{SWIRLY_HOME}")
-ELSE()
-  MESSAGE(FATAL_ERROR "SWIRLY_HOME is not set")
-ENDIF()
+if(DEFINED ENV{SWIRLY_HOME})
+  message("SWIRLY_HOME is set to $ENV{SWIRLY_HOME}")
+else()
+  message(FATAL_ERROR "SWIRLY_HOME is not set")
+endif()
 
-SET(COMMON_WARN "-Wall -Werror -Wextra -Wstrict-aliasing=2 -Wno-unused-parameter")
-SET(COMMON_FLAGS "-fstrict-aliasing -fvisibility=hidden")
-SET(CMAKE_CXX_FLAGS "-std=c++14 ${COMMON_FLAGS} ${COMMON_WARN} -fno-rtti")
+set(COMMON_WARN "-Wall -Werror -Wextra -Wstrict-aliasing=2 -Wno-unused-parameter")
+set(COMMON_FLAGS "-fstrict-aliasing -fvisibility=hidden")
+set(CMAKE_CXX_FLAGS "-std=c++14 ${COMMON_FLAGS} ${COMMON_WARN} -fno-rtti")
 
-SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "$ENV{SWIRLY_HOME}/etc")
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "$ENV{SWIRLY_HOME}/etc")
 
-FIND_PACKAGE(Swirly REQUIRED)
+find_package(Swirly REQUIRED)
 
-INCLUDE_DIRECTORIES(${SWIRLY_INCLUDE_DIRS})
+include_directories(${SWIRLY_INCLUDE_DIRS})
 
-ADD_EXECUTABLE(helloworld Main.cpp)
-TARGET_LINK_LIBRARIES(helloworld ${SWIRLY_ASH_LIBRARY})
+add_executable(helloworld Main.cpp)
+target_link_libraries(helloworld ${SWIRLY_ASH_LIBRARY})
diff --git a/image/CMakeLists.txt b/image/CMakeLists.txt
@@ -13,36 +13,36 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-INCLUDE(AddFileDependencies)
+include(AddFileDependencies)
 
-SET(outfiles)
-IF(DOT_EXECUTABLE)
+set(outfiles)
+if(DOT_EXECUTABLE)
 
-  MESSAGE(STATUS "Dot found: ${DOT_EXECUTABLE}")
+  message(STATUS "Dot found: ${DOT_EXECUTABLE}")
 
-  SET(names
+  set(names
     Ash
     Elm
     Fig
     Fir
   )
 
-  FOREACH(name ${names})
+  foreach(name ${names})
 
-    SET(outfile "${PROJECT_BINARY_DIR}/image/${name}Depend.png")
+    set(outfile "${PROJECT_BINARY_DIR}/image/${name}Depend.png")
 
-    STRING(TOLOWER ${name} lname)
-    ADD_CUSTOM_COMMAND(
+    string(TOLOWER ${name} lname)
+    add_custom_command(
       OUTPUT "${outfile}"
       WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
       COMMAND CXX="${CMAKE_CXX_COMPILER}" "${PERL}" etc/dotdepend.pl ${lname}
               | "${DOT_EXECUTABLE}" -Tpng >"${outfile}"
       DEPENDS "${PROJECT_SOURCE_DIR}/etc/dotdepend.pl"
               ${lname}_static)
 
-    SET(outfiles ${outfiles} "${outfile}")
-  ENDFOREACH()
+    set(outfiles ${outfiles} "${outfile}")
+  endforeach()
 
-ENDIF()
+endif()
 
-ADD_CUSTOM_TARGET(image ALL DEPENDS ${outfiles})
+add_custom_target(image ALL DEPENDS ${outfiles})
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -13,7 +13,7 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/include/swirly/"
+install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/swirly/"
                   DESTINATION include/swirly
                   FILES_MATCHING
                   PATTERN "*.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -13,5 +13,5 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-ADD_SUBDIRECTORY(bin)
-ADD_SUBDIRECTORY(lib)
+add_subdirectory(bin)
+add_subdirectory(lib)
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
@@ -13,5 +13,5 @@
 # not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-ADD_SUBDIRECTORY(swirlyd)
-ADD_SUBDIRECTORY(tool)
+add_subdirectory(swirlyd)
+add_subdirectory(tool)