From 0417e626c0123de23dbc912fda65e4701b467c1c Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Wed, 12 Dec 2018 09:40:05 -0600 Subject: [PATCH] STYLE: Convert CMake-language commands to lower case Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. --- CMakeLists.txt | 186 +++++++++++++++--------------- include/CMakeLists.txt | 4 +- src/CMakeLists.txt | 10 +- src/jsontestrunner/CMakeLists.txt | 26 ++--- src/lib_json/CMakeLists.txt | 88 +++++++------- src/test_lib_json/CMakeLists.txt | 26 ++--- 6 files changed, 170 insertions(+), 170 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8374c41f6..83486cd64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,156 +1,156 @@ # vim: et ts=4 sts=4 sw=4 tw=0 -CMAKE_MINIMUM_REQUIRED(VERSION 3.1) +cmake_minimum_required(VERSION 3.1) # Ensures that CMAKE_BUILD_TYPE has a default value -IF(NOT DEFINED CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE Release CACHE STRING +if(NOT DEFINED CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Coverage.") -ENDIF() +endif() -PROJECT(jsoncpp) -ENABLE_TESTING() +project(jsoncpp) +enable_testing() -OPTION(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON) -OPTION(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON) -OPTION(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF) -OPTION(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON) -OPTION(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON) -OPTION(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON) -OPTION(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." OFF) +option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON) +option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON) +option(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF) +option(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON) +option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON) +option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON) +option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." OFF) # Enable runtime search path support for dynamic libraries on OSX -IF(APPLE) - SET(CMAKE_MACOSX_RPATH 1) -ENDIF() +if(APPLE) + set(CMAKE_MACOSX_RPATH 1) +endif() # Adhere to GNU filesystem layout conventions -INCLUDE(GNUInstallDirs) +include(GNUInstallDirs) -SET(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build") +set(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build") # Set variable named ${VAR_NAME} to value ${VALUE} -FUNCTION(set_using_dynamic_name VAR_NAME VALUE) - SET( "${VAR_NAME}" "${VALUE}" PARENT_SCOPE) -ENDFUNCTION() +function(set_using_dynamic_name VAR_NAME VALUE) + set( "${VAR_NAME}" "${VALUE}" PARENT_SCOPE) +endfunction() # Extract major, minor, patch from version text # Parse a version string "X.Y.Z" and outputs # version parts in ${OUPUT_PREFIX}_MAJOR, _MINOR, _PATCH. # If parse succeeds then ${OUPUT_PREFIX}_FOUND is TRUE. -MACRO(jsoncpp_parse_version VERSION_TEXT OUPUT_PREFIX) - SET(VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z0-9_]+)?") - IF( ${VERSION_TEXT} MATCHES ${VERSION_REGEX} ) - STRING(REGEX MATCHALL "[0-9]+|-([A-Za-z0-9_]+)" VERSION_PARTS ${VERSION_TEXT}) - LIST(GET VERSION_PARTS 0 ${OUPUT_PREFIX}_MAJOR) - LIST(GET VERSION_PARTS 1 ${OUPUT_PREFIX}_MINOR) - LIST(GET VERSION_PARTS 2 ${OUPUT_PREFIX}_PATCH) +macro(jsoncpp_parse_version VERSION_TEXT OUPUT_PREFIX) + set(VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z0-9_]+)?") + if( ${VERSION_TEXT} MATCHES ${VERSION_REGEX} ) + string(REGEX MATCHALL "[0-9]+|-([A-Za-z0-9_]+)" VERSION_PARTS ${VERSION_TEXT}) + list(GET VERSION_PARTS 0 ${OUPUT_PREFIX}_MAJOR) + list(GET VERSION_PARTS 1 ${OUPUT_PREFIX}_MINOR) + list(GET VERSION_PARTS 2 ${OUPUT_PREFIX}_PATCH) set_using_dynamic_name( "${OUPUT_PREFIX}_FOUND" TRUE ) - ELSE( ${VERSION_TEXT} MATCHES ${VERSION_REGEX} ) + else( ${VERSION_TEXT} MATCHES ${VERSION_REGEX} ) set_using_dynamic_name( "${OUPUT_PREFIX}_FOUND" FALSE ) - ENDIF() -ENDMACRO() + endif() +endmacro() # Read out version from "version" file -#FILE(STRINGS "version" JSONCPP_VERSION) -#SET( JSONCPP_VERSION_MAJOR X ) -#SET( JSONCPP_VERSION_MINOR Y ) -#SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.8.4 ) +#file(STRINGS "version" JSONCPP_VERSION) +#set( JSONCPP_VERSION_MAJOR X ) +#set( JSONCPP_VERSION_MINOR Y ) +#set( JSONCPP_VERSION_PATCH Z ) +set( JSONCPP_VERSION 1.8.4 ) jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) -#IF(NOT JSONCPP_VERSION_FOUND) -# MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") -#ENDIF(NOT JSONCPP_VERSION_FOUND) -SET( JSONCPP_SOVERSION 19 ) -SET( JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" ) +#if(NOT JSONCPP_VERSION_FOUND) +# message(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") +#endif(NOT JSONCPP_VERSION_FOUND) +set( JSONCPP_SOVERSION 19 ) +set( JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" ) -MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") +message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") # File version.h is only regenerated on CMake configure step -CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/src/lib_json/version.h.in" +configure_file( "${PROJECT_SOURCE_DIR}/src/lib_json/version.h.in" "${PROJECT_BINARY_DIR}/include/json/version.h" NEWLINE_STYLE UNIX ) -CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/version.in" +configure_file( "${PROJECT_SOURCE_DIR}/version.in" "${PROJECT_BINARY_DIR}/version" NEWLINE_STYLE UNIX ) -MACRO(UseCompilationWarningAsError) - IF(MSVC) +macro(UseCompilationWarningAsError) + if(MSVC) # Only enabled in debug because some old versions of VS STL generate # warnings when compiled in release configuration. - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX ") - ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - IF(JSONCPP_WITH_STRICT_ISO) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors") - ENDIF() - ENDIF() -ENDMACRO() + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX ") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + if(JSONCPP_WITH_STRICT_ISO) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors") + endif() + endif() +endmacro() # Include our configuration header -INCLUDE_DIRECTORIES( ${jsoncpp_SOURCE_DIR}/include ) +include_directories( ${jsoncpp_SOURCE_DIR}/include ) -IF(MSVC) +if(MSVC) # Only enabled in debug because some old versions of VS STL generate # unreachable code warning when compiled in release configuration. - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 ") -ENDIF() + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 ") +endif() # Require C++11 support, prefer ISO C++ over GNU variants, # as relying solely on ISO C++ is more portable. -SET(CMAKE_CXX_STANDARD 11) -SET(CMAKE_CXX_STANDARD_REQUIRED ON) -SET(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) -IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") # using regular Clang or AppleClang - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare") -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare") +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # using GCC - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra") # not yet ready for -Wsign-conversion - IF(JSONCPP_WITH_STRICT_ISO) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - ENDIF() - IF(JSONCPP_WITH_WARNING_AS_ERROR) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=conversion") - ENDIF() -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + if(JSONCPP_WITH_STRICT_ISO) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") + endif() + if(JSONCPP_WITH_WARNING_AS_ERROR) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=conversion") + endif() +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") # using Intel compiler - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra -Werror=conversion") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra -Werror=conversion") - IF(JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - ENDIF() -ENDIF() + if(JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") + endif() +endif() -FIND_PROGRAM(CCACHE_FOUND ccache) -IF(CCACHE_FOUND) - SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) -ENDIF(CCACHE_FOUND) +find_program(CCACHE_FOUND ccache) +if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +endif(CCACHE_FOUND) -IF(JSONCPP_WITH_WARNING_AS_ERROR) +if(JSONCPP_WITH_WARNING_AS_ERROR) UseCompilationWarningAsError() -ENDIF() +endif() -IF(JSONCPP_WITH_PKGCONFIG_SUPPORT) - CONFIGURE_FILE( +if(JSONCPP_WITH_PKGCONFIG_SUPPORT) + configure_file( "pkg-config/jsoncpp.pc.in" "pkg-config/jsoncpp.pc" @ONLY) - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkg-config/jsoncpp.pc" + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkg-config/jsoncpp.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -ENDIF() +endif() -IF(JSONCPP_WITH_CMAKE_PACKAGE) - INSTALL(EXPORT jsoncpp +if(JSONCPP_WITH_CMAKE_PACKAGE) + install(EXPORT jsoncpp DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp FILE jsoncppConfig.cmake) -ENDIF() +endif() # Build the different applications -ADD_SUBDIRECTORY( src ) +add_subdirectory( src ) #install the includes -ADD_SUBDIRECTORY( include ) +add_subdirectory( include ) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index cc866f173..7f1cb9822 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1,2 @@ -FILE(GLOB INCLUDE_FILES "json/*.h") -INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json) +file(GLOB INCLUDE_FILES "json/*.h") +install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca8ac15e2..0f82a7463 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ -ADD_SUBDIRECTORY(lib_json) -IF(JSONCPP_WITH_TESTS) - ADD_SUBDIRECTORY(jsontestrunner) - ADD_SUBDIRECTORY(test_lib_json) -ENDIF() +add_subdirectory(lib_json) +if(JSONCPP_WITH_TESTS) + add_subdirectory(jsontestrunner) + add_subdirectory(test_lib_json) +endif() diff --git a/src/jsontestrunner/CMakeLists.txt b/src/jsontestrunner/CMakeLists.txt index 3d2ffee69..9862399a8 100644 --- a/src/jsontestrunner/CMakeLists.txt +++ b/src/jsontestrunner/CMakeLists.txt @@ -1,23 +1,23 @@ -FIND_PACKAGE(PythonInterp 2.6) +find_package(PythonInterp 2.6) -ADD_EXECUTABLE(jsontestrunner_exe +add_executable(jsontestrunner_exe main.cpp ) -IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS( -DJSON_DLL ) -ENDIF() -TARGET_LINK_LIBRARIES(jsontestrunner_exe jsoncpp_lib) +if(BUILD_SHARED_LIBS) + add_definitions( -DJSON_DLL ) +endif() +target_link_libraries(jsontestrunner_exe jsoncpp_lib) -SET_TARGET_PROPERTIES(jsontestrunner_exe PROPERTIES OUTPUT_NAME jsontestrunner_exe) +set_target_properties(jsontestrunner_exe PROPERTIES OUTPUT_NAME jsontestrunner_exe) -IF(PYTHONINTERP_FOUND) +if(PYTHONINTERP_FOUND) # Run end to end parser/writer tests - SET(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../test) - SET(RUNJSONTESTS_PATH ${TEST_DIR}/runjsontests.py) - ADD_CUSTOM_TARGET(jsoncpp_readerwriter_tests + set(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../test) + set(RUNJSONTESTS_PATH ${TEST_DIR}/runjsontests.py) + add_custom_target(jsoncpp_readerwriter_tests "${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" $ "${TEST_DIR}/data" DEPENDS jsontestrunner_exe jsoncpp_test ) - ADD_CUSTOM_TARGET(jsoncpp_check DEPENDS jsoncpp_readerwriter_tests) -ENDIF() + add_custom_target(jsoncpp_check DEPENDS jsoncpp_readerwriter_tests) +endif() diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index d710ce0c2..6f89eb13a 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -1,45 +1,45 @@ -IF( CMAKE_COMPILER_IS_GNUCXX ) +if( CMAKE_COMPILER_IS_GNUCXX ) #Get compiler version. - EXECUTE_PROCESS( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion + execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GNUCXX_VERSION ) #-Werror=* was introduced -after- GCC 4.1.2 - IF( GNUCXX_VERSION VERSION_GREATER 4.1.2 ) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing") - ENDIF() -ENDIF( CMAKE_COMPILER_IS_GNUCXX ) + if( GNUCXX_VERSION VERSION_GREATER 4.1.2 ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing") + endif() +endif( CMAKE_COMPILER_IS_GNUCXX ) -INCLUDE(CheckIncludeFileCXX) -INCLUDE(CheckTypeSize) -INCLUDE(CheckStructHasMember) -INCLUDE(CheckCXXSymbolExists) +include(CheckIncludeFileCXX) +include(CheckTypeSize) +include(CheckStructHasMember) +include(CheckCXXSymbolExists) check_include_file_cxx(clocale HAVE_CLOCALE) check_cxx_symbol_exists(localeconv clocale HAVE_LOCALECONV) -IF(CMAKE_VERSION VERSION_LESS 3.0.0) +if(CMAKE_VERSION VERSION_LESS 3.0.0) # The "LANGUAGE CXX" parameter is not supported in CMake versions below 3, # so the C compiler and header has to be used. check_include_file(locale.h HAVE_LOCALE_H) - SET(CMAKE_EXTRA_INCLUDE_FILES locale.h) + set(CMAKE_EXTRA_INCLUDE_FILES locale.h) check_type_size("struct lconv" LCONV_SIZE) - UNSET(CMAKE_EXTRA_INCLUDE_FILES) + unset(CMAKE_EXTRA_INCLUDE_FILES) check_struct_has_member("struct lconv" decimal_point locale.h HAVE_DECIMAL_POINT) -ELSE() - SET(CMAKE_EXTRA_INCLUDE_FILES clocale) +else() + set(CMAKE_EXTRA_INCLUDE_FILES clocale) check_type_size(lconv LCONV_SIZE LANGUAGE CXX) - UNSET(CMAKE_EXTRA_INCLUDE_FILES) + unset(CMAKE_EXTRA_INCLUDE_FILES) check_struct_has_member(lconv decimal_point clocale HAVE_DECIMAL_POINT LANGUAGE CXX) -ENDIF() +endif() -IF(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV)) - MESSAGE(WARNING "Locale functionality is not supported") - ADD_DEFINITIONS(-DJSONCPP_NO_LOCALE_SUPPORT) -ENDIF() +if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALECONV)) + message(WARNING "Locale functionality is not supported") + add_definitions(-DJSONCPP_NO_LOCALE_SUPPORT) +endif() -SET( JSONCPP_INCLUDE_DIR ../../include ) +set( JSONCPP_INCLUDE_DIR ../../include ) -SET( PUBLIC_HEADERS +set( PUBLIC_HEADERS ${JSONCPP_INCLUDE_DIR}/json/config.h ${JSONCPP_INCLUDE_DIR}/json/forwards.h ${JSONCPP_INCLUDE_DIR}/json/features.h @@ -50,9 +50,9 @@ SET( PUBLIC_HEADERS ${JSONCPP_INCLUDE_DIR}/json/version.h ) -SOURCE_GROUP( "Public API" FILES ${PUBLIC_HEADERS} ) +source_group( "Public API" FILES ${PUBLIC_HEADERS} ) -SET(jsoncpp_sources +set(jsoncpp_sources json_tool.h json_reader.cpp json_valueiterator.inl @@ -61,35 +61,35 @@ SET(jsoncpp_sources version.h.in) # Install instructions for this target -IF(JSONCPP_WITH_CMAKE_PACKAGE) - SET(INSTALL_EXPORT EXPORT jsoncpp) -ELSE(JSONCPP_WITH_CMAKE_PACKAGE) - SET(INSTALL_EXPORT) -ENDIF() +if(JSONCPP_WITH_CMAKE_PACKAGE) + set(INSTALL_EXPORT EXPORT jsoncpp) +else(JSONCPP_WITH_CMAKE_PACKAGE) + set(INSTALL_EXPORT) +endif() -IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS( -DJSON_DLL_BUILD ) -ENDIF() +if(BUILD_SHARED_LIBS) + add_definitions( -DJSON_DLL_BUILD ) +endif() -ADD_LIBRARY(jsoncpp_lib ${PUBLIC_HEADERS} ${jsoncpp_sources}) -SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION}) -SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp +add_library(jsoncpp_lib ${PUBLIC_HEADERS} ${jsoncpp_sources}) +set_target_properties( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION}) +set_target_properties( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} ) -SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES POSITION_INDEPENDENT_CODE ON) +set_target_properties( jsoncpp_lib PROPERTIES POSITION_INDEPENDENT_CODE ON) # Set library's runtime search path on OSX -IF(APPLE) - SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES INSTALL_RPATH "@loader_path/." ) -ENDIF() +if(APPLE) + set_target_properties( jsoncpp_lib PROPERTIES INSTALL_RPATH "@loader_path/." ) +endif() -INSTALL( TARGETS jsoncpp_lib ${INSTALL_EXPORT} +install( TARGETS jsoncpp_lib ${INSTALL_EXPORT} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -IF(NOT CMAKE_VERSION VERSION_LESS 2.8.11) - TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib PUBLIC +if(NOT CMAKE_VERSION VERSION_LESS 2.8.11) + target_include_directories( jsoncpp_lib PUBLIC $ $) -ENDIF() +endif() diff --git a/src/test_lib_json/CMakeLists.txt b/src/test_lib_json/CMakeLists.txt index c6a534f30..7c7b6afe7 100644 --- a/src/test_lib_json/CMakeLists.txt +++ b/src/test_lib_json/CMakeLists.txt @@ -1,36 +1,36 @@ # vim: et ts=4 sts=4 sw=4 tw=0 -ADD_EXECUTABLE( jsoncpp_test +add_executable( jsoncpp_test jsontest.cpp jsontest.h main.cpp ) -IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS( -DJSON_DLL ) -ENDIF() -TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib) +if(BUILD_SHARED_LIBS) + add_definitions( -DJSON_DLL ) +endif() +target_link_libraries(jsoncpp_test jsoncpp_lib) # another way to solve issue #90 #set_target_properties(jsoncpp_test PROPERTIES COMPILE_FLAGS -ffloat-store) # Run unit tests in post-build # (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?) -IF(JSONCPP_WITH_POST_BUILD_UNITTEST) - IF(BUILD_SHARED_LIBS) +if(JSONCPP_WITH_POST_BUILD_UNITTEST) + if(BUILD_SHARED_LIBS) # First, copy the shared lib, for Microsoft. # Then, run the test executable. - ADD_CUSTOM_COMMAND( TARGET jsoncpp_test + add_custom_command( TARGET jsoncpp_test POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) - ELSE(BUILD_SHARED_LIBS) + else(BUILD_SHARED_LIBS) # Just run the test executable. - ADD_CUSTOM_COMMAND( TARGET jsoncpp_test + add_custom_command( TARGET jsoncpp_test POST_BUILD COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) - ENDIF() -ENDIF() + endif() +endif() -SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test) +set_target_properties(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test)