imach/CMakeLists.txt - diff

Return to CMakeLists.txt CVS log

Up to [Local Repository] / imach

Diff for /imach/CMakeLists.txt between versions 1.1 and 1.5

version 1.1, 2015/08/18 16:44:58	version 1.5, 2015/09/15 17:57:21
Line 7	Line 7
# endif()	# endif()
# SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)	# SET (CMAKE_CONFIGURATION_TYPES "Debug;RelWithDebinfo" CACHE STRING "" FORCE)
SET(IMACH_VERSION_MAJOR 0)	SET(IMACH_VERSION_MAJOR 0)
SET(IMACH_VERSION_MINOR 98q5)	SET(IMACH_VERSION_MINOR 98r0)
SET(IMACH_VERSION_PATCH 0)	SET(IMACH_VERSION_PATCH 0)
SET(IMACH_VERSION_NOTE "")	SET(IMACH_VERSION_NOTE "")
SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})	SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
	SET(@APPNAME@ IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
	SET(@NOTINNOREG@ )
	SET(@NOREG@ )
	SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)
	SET(@APPCOMPILATIONMODE@ icl)
	SET(@VERSION@ ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
	SET(@GNUPLOTVERSION@ 4.6)
	SET(@INFOBEFOREFILE@ README.txt)
	SET(@LICENSEFILE@ Copying)
	SET(@PACKAGE@ imach)
	SET(@DICTLANG@ en)
	SET(@VERMAJOR@ )
	SET(@COPYRIGHT@ "Copyright (C) 2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015")
#SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}.${IMACH_VERSION_PATCH})	#SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}.${IMACH_VERSION_PATCH})
#MATH(EXPR IMACH_VERSION_NUMBER "100000${IMACH_VERSION_MAJOR} + 100${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")	#MATH(EXPR IMACH_VERSION_NUMBER "100000${IMACH_VERSION_MAJOR} + 100${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")

Line 21 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)	Line 34 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)

CONFIGURE_FILE(	CONFIGURE_FILE(
"${PROJECT_SOURCE_DIR}/version.h.in"	"${PROJECT_SOURCE_DIR}/version.h.in"
"${PROJECT_BINARY_DIR}/version.h"	"${PROJECT_SOURCE_DIR}/src/version.h"
)	)
CONFIGURE_FILE(	CONFIGURE_FILE(
"${PROJECT_SOURCE_DIR}/config.h.in"	"${PROJECT_SOURCE_DIR}/config.h.in"
"${PROJECT_BINARY_DIR}/config.h"	"${PROJECT_BINARY_DIR}/config.h"
)	)
	# Examples for the documentation
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/mypar.imach.in" "html/doc/mypar.imach")
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/biaspar.imach.in" "html/doc/biaspar.imach")
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data1.txt" "html/doc/data1.txt" COPYONLY)
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/mydata.txt" "html/doc/data/mydata.txt" COPYONLY)
	# Test files
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/data2.txt" "tests/data/data2.txt" COPYONLY)
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV2.imach" "tests/testV2.imach" COPYONLY)
	CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/testV1V2.imach" "tests/testV1V2.imach" COPYONLY)


set (imach_SRCS ./src/imach.c)	set (imach_SRCS ./src/imach.c)
SET( CMAKE_VERBOSE_MAKEFILE on )	SET( CMAKE_VERBOSE_MAKEFILE on )
ADD_EXECUTABLE ( IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS})	ADD_EXECUTABLE ( IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS})
INSTALL(TARGETS IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries )	INSTALL(TARGETS IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries )
ADD_SUBDIRECTORY(html)	ADD_SUBDIRECTORY(html)
	ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(src)	ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(distributions)	ADD_SUBDIRECTORY(distributions)
#if (${WIN32})	#if (${WIN32})
	#if(APPLE)
	# set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
	#endif()
if(UNIX)	if(UNIX)
# set(CMAKE_CXX_COMPILER "gcc")	# set(CMAKE_CXX_COMPILER "gcc")
target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m)	target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m)
Line 48 if(UNIX)	Line 75 if(UNIX)
set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")	set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
endif()	endif()
if(MSVC)	if(MSVC)
	set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
Line 137 INCLUDE(CPack)	Line 165 INCLUDE(CPack)
# else()	# else()
# set(VERSION_PATCH "${BUILD_VERSION_PATCH}")	# set(VERSION_PATCH "${BUILD_VERSION_PATCH}")
# ENDIF()	# ENDIF()
	file( GLOB_RECURSE parameter_files RELATIVE
	"${CMAKE_CURRENT_SOURCE_DIR}/html/doc" "html/*.imach" )
	foreach( parameter_file ${parameter_files} )
	add_custom_command(
	OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
	COMMAND cmake -E copy
	"${CMAKE_CURRENT_SOURCE_DIR}/${parameter_file}"
	"${CMAKE_CURRENT_BINARY_DIR}/${parameter_file}"
	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${parameter_file}"
	)
	list( APPEND parameter_files_dest "${parameter_file}" )
	endforeach( parameter_file )

	#add_custom_target( CopyParameter ALL DEPENDS ${parameter_files_dest} )
ENABLE_TESTING()	ENABLE_TESTING()
SUBDIRS(html/doc)	ADD_SUBDIRECTORY(html/doc)
SUBDIRS(html/doc/data)	ADD_SUBDIRECTORY(html/doc/data)
	install(FILES "${PROJECT_SOURCE_DIR}/html/doc/mypar.imach" DESTINATION "html/doc/mypar.imach")
	ADD_TEST(testV2.imach IMaCh-${IMACH_VERSION} tests/testV2.imach )
	ADD_TEST(testV1V2.imach IMaCh-${IMACH_VERSION} tests/testV1V2.imach )
ADD_TEST(mypar IMaCh-${IMACH_VERSION} html/doc/mypar.imach )	ADD_TEST(mypar IMaCh-${IMACH_VERSION} html/doc/mypar.imach )
ADD_TEST(biaspar IMaCh-${IMACH_VERSION} html/doc/biaspar.imach )	ADD_TEST(biaspar IMaCh-${IMACH_VERSION} html/doc/biaspar.imach )
#SET(FAB "po" CACHE STRING "Some user-specified option")	#SET(FAB "po" CACHE STRING "Some user-specified option")

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1
changed lines
	Added in v.1.5