aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-10-25 22:47:31 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-10-25 22:47:31 -0700
commit995050a54053b32b9a34892f3b86c127d5aad5b9 (patch)
tree1007d1287b23a9ba22b4fa3ccf741dcbe696e84d
parent98460f8916aaa9bf50b8a3a1500a843b1b24150a (diff)
CMakeLists tweaks.
Use compiler optimizations, -Wall, -Werror.
-rw-r--r--CMakeLists.txt252
-rw-r--r--src/CMakeLists.txt10
2 files changed, 137 insertions, 125 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61aae94..59c2f0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,119 +1,133 @@
-project(cmark)
-cmake_minimum_required(VERSION 2.8)
-
-set(PROJECT_NAME "cmark")
-
-set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 0)
-set(PROJECT_VERSION_PATCH 1)
-set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} )
-
-include (CheckIncludeFile)
-CHECK_INCLUDE_FILE (stdbool.h HAVE_STDBOOL_H)
-
-#option(${PROJECT_NAME}_WITH_DOCS "generate Documentation" OFF)
-#option(${PROJECT_NAME}_WITH_TESTS "enable testing" ON)
-option(CMAKE_SUPPRESS_REGENERATION "suppress rules to re-run cmake on changes (warning: no dependency checks!)?" OFF)
-if (MSVC)
- set(RE2C ${CMAKE_CURRENT_SOURCE_DIR}/re2c)
-else(MSVC)
- set(RE2C re2c)
-endif(MSVC)
-
-if (MSVC)
- option(PROJECT_LINK_MSVC_MT "link with /MT instead of /MD (use msvc runtime dlls versus static linked)" ON)
- # see http://msdn.microsoft.com/en-us/library/2kzt1wy3%28VS.71%29.aspx
- if (PROJECT_LINK_MSVC_MT)
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
- endif (PROJECT_LINK_MSVC_MT)
-
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4")
-
- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS UNICODE)
- set(CMAKE_FIND_LIBRARY_PREFIXES "")
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
- set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
- set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
- set(CMAKE_SHARED_LIBRARY_PREFIX "") # lib
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") # .so
- set(CMAKE_IMPORT_LIBRARY_PREFIX "")
- set(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib")
- set(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe
- set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
- set(CMAKE_DL_LIBS "")
- set(CMAKE_DEBUG_POSTFIX "d")
- add_definitions(-DUNICODE -D_UNICODE)
-else(MSVC)
- list(APPEND CMAKE_CXX_FLAGS "-Wall -Wunused-variable -Wno-long-long")
- #-pedantic
- list(APPEND CMAKE_C_FLAGS "-Wall -Wunused-variable -Wno-long-long")
-endif(MSVC)
-
-# create config.h
-# configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
-# ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
-# set include directories
-get_filename_component(CONFIG_INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/config.h PATH)
-include_directories(include ${CONFIG_INCLUDE})
-
-install(DIRECTORY include DESTINATION .
- COMPONENT devel
- FILES_MATCHING PATTERN "*.h"
- PATTERN .svn EXCLUDE
- )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
- DESTINATION include/${PROJECT_NAME}
- COMPONENT devel)
-
-add_subdirectory(src)
-
-include(InstallRequiredSystemLibraries)
-
-set(CPACK_GENERATOR TGZ ZIP)
-if(WIN32 AND NOT CYGWIN)
- set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR})
-endif(WIN32 AND NOT CYGWIN)
-if(APPLE)
- set(CPACK_GENERATOR DragNDrop ${CPACK_GENERATOR})
-endif(APPLE)
-if (UNIX AND NOT APPLE AND NOT WIN32)
- set(CPACK_GENERATOR DEB ${CPACK_GENERATOR})
-endif (UNIX AND NOT APPLE AND NOT WIN32)
-
-set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-src-${PROJECT_VERSION})
-set(CPACK_SOURCE_GENERATOR TGZ ZIP)
-set(CPACK_PACKAGE_CONTACT http://talk.commonmark.org/)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME})
-set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME} Development Team")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-set(CPACK_SOURCE_IGNORE_FILES "/docs/html;/autom4te.cache;/build/;/win32/;/.svn/;~$;${CPACK_SOURCE_IGNORE_FILES}")
-
-if(WIN32 AND NOT UNIX)
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}\\\\${PROJECT_VERSION}")
- # There is a bug in NSI that does not handle full unix paths properly. Make
- # sure there is at least one set of four (4) backlashes.
- # set(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
- set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${PROJECT_NAME}.exe")
- set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
- set(CPACK_NSIS_HELP_LINK "http://commonmark.org/")
- set(CPACK_NSIS_URL_INFO_ABOUT "http://commonmark.org/")
- set(CPACK_NSIS_CONTACT "http://talk.commonmark.org/")
- set(CPACK_NSIS_MODIFY_PATH ON)
- set(CPACK_NSIS_MENU_LINKS "doc/html/index.html;Documentation")
-else(WIN32 AND NOT UNIX)
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION}")
- set(CPACK_STRIP_FILES "bin/${PROJECT_NAME}")
- set(CPACK_SOURCE_STRIP_FILES "")
-endif(WIN32 AND NOT UNIX)
-set(CPACK_PACKAGE_EXECUTABLES ${PROJECT_NAME};${PROJECT_NAME})
-include(CPack)
+project(cmark)
+cmake_minimum_required(VERSION 2.8)
+
+set(PROJECT_NAME "cmark")
+
+set(PROJECT_VERSION_MAJOR 0)
+set(PROJECT_VERSION_MINOR 0)
+set(PROJECT_VERSION_PATCH 1)
+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} )
+
+include (CheckIncludeFile)
+CHECK_INCLUDE_FILE (stdbool.h HAVE_STDBOOL_H)
+
+set(CMAKE_BUILD_TYPE Release)
+
+if(MSVC)
+ # Force to always compile with W4
+ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+ string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+ endif()
+elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ # Update if necessary
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
+endif()
+
+#option(${PROJECT_NAME}_WITH_DOCS "generate Documentation" OFF)
+#option(${PROJECT_NAME}_WITH_TESTS "enable testing" ON)
+option(CMAKE_SUPPRESS_REGENERATION "suppress rules to re-run cmake on changes (warning: no dependency checks!)?" OFF)
+if (MSVC)
+ set(RE2C ${CMAKE_CURRENT_SOURCE_DIR}/re2c)
+else(MSVC)
+ set(RE2C re2c)
+endif(MSVC)
+
+if (MSVC)
+ option(PROJECT_LINK_MSVC_MT "link with /MT instead of /MD (use msvc runtime dlls versus static linked)" ON)
+ # see http://msdn.microsoft.com/en-us/library/2kzt1wy3%28VS.71%29.aspx
+ if (PROJECT_LINK_MSVC_MT)
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+ endif (PROJECT_LINK_MSVC_MT)
+
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4")
+
+ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS UNICODE)
+ set(CMAKE_FIND_LIBRARY_PREFIXES "")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+ set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
+ set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
+ set(CMAKE_SHARED_LIBRARY_PREFIX "") # lib
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") # .so
+ set(CMAKE_IMPORT_LIBRARY_PREFIX "")
+ set(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib")
+ set(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe
+ set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
+ set(CMAKE_DL_LIBS "")
+ set(CMAKE_DEBUG_POSTFIX "d")
+ add_definitions(-DUNICODE -D_UNICODE)
+else(MSVC)
+ list(APPEND CMAKE_CXX_FLAGS "-Wall -Wunused-variable -Wno-long-long")
+ #-pedantic
+ list(APPEND CMAKE_C_FLAGS "-Wall -Wunused-variable -Wno-long-long")
+endif(MSVC)
+
+# create config.h
+# configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+# ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+# set include directories
+get_filename_component(CONFIG_INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/config.h PATH)
+include_directories(include ${CONFIG_INCLUDE})
+
+install(DIRECTORY include DESTINATION .
+ COMPONENT devel
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN .svn EXCLUDE
+ )
+# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
+# DESTINATION include/${PROJECT_NAME}
+# COMPONENT devel)
+
+add_subdirectory(src)
+
+include(InstallRequiredSystemLibraries)
+
+set(CPACK_GENERATOR TGZ ZIP)
+if(WIN32 AND NOT CYGWIN)
+ set(CPACK_GENERATOR NSIS ${CPACK_GENERATOR})
+endif(WIN32 AND NOT CYGWIN)
+if(APPLE)
+ set(CPACK_GENERATOR DragNDrop ${CPACK_GENERATOR})
+endif(APPLE)
+if (UNIX AND NOT APPLE AND NOT WIN32)
+ set(CPACK_GENERATOR DEB ${CPACK_GENERATOR})
+endif (UNIX AND NOT APPLE AND NOT WIN32)
+
+set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-src-${PROJECT_VERSION})
+set(CPACK_SOURCE_GENERATOR TGZ ZIP)
+set(CPACK_PACKAGE_CONTACT http://talk.commonmark.org/)
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME})
+set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME} Development Team")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
+set(CPACK_SOURCE_IGNORE_FILES "/docs/html;/autom4te.cache;/build/;/win32/;/.svn/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+
+if(WIN32 AND NOT UNIX)
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}\\\\${PROJECT_VERSION}")
+ # There is a bug in NSI that does not handle full unix paths properly. Make
+ # sure there is at least one set of four (4) backlashes.
+ # set(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
+ set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${PROJECT_NAME}.exe")
+ set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ${PROJECT_NAME}")
+ set(CPACK_NSIS_HELP_LINK "http://commonmark.org/")
+ set(CPACK_NSIS_URL_INFO_ABOUT "http://commonmark.org/")
+ set(CPACK_NSIS_CONTACT "http://talk.commonmark.org/")
+ set(CPACK_NSIS_MODIFY_PATH ON)
+ set(CPACK_NSIS_MENU_LINKS "doc/html/index.html;Documentation")
+else(WIN32 AND NOT UNIX)
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION}")
+ set(CPACK_STRIP_FILES "bin/${PROJECT_NAME}")
+ set(CPACK_SOURCE_STRIP_FILES "")
+endif(WIN32 AND NOT UNIX)
+set(CPACK_PACKAGE_EXECUTABLES ${PROJECT_NAME};${PROJECT_NAME})
+include(CPack)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2258178..aa6ec3d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,17 +36,15 @@ else(MSVC)
COMMAND ${RE2C} --case-insensitive -b -i ${CMAKE_CURRENT_SOURCE_DIR}/scanners.re >${CMAKE_CURRENT_SOURCE_DIR}/scanners.c)
endif(MSVC)
-add_executable(${PROGRAM_cmark}
+add_executable(${PROGRAM_cmark}
${PROGRAM_cmark_SOURCES})
if (MSVC)
-set_property(TARGET ${PROGRAM_cmark}
- APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
+set_property(TARGET ${PROGRAM_cmark}
+ APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
# if sometimes libs are needed ...
#target_link_libraries(${PROGRAM_chronolog})
endif(MSVC)
install(TARGETS ${PROGRAM_cmark}
-RUNTIME DESTINATION bin
+RUNTIME DESTINATION bin
BUNDLE DESTINATION /Applications)
-
-