Migrates non-ArcGIS built successfully (tbc)
This commit is contained in:
6 files changed
+45
-12
No files matched your search
@@ -122,11 +122,10 @@ SET(_components ALL SV WS AAR TOOLSWS TOOLSSV HLA)
|
||||
|
||||
|
||||
MACRO (NGL_GET_BUILDPARTS _args _buildopts)
|
||||
|
||||
SET(${_buildopts} "")
|
||||
SET(_at_least_one_keyword_found OFF)
|
||||
|
||||
MESSAGE(STATUS "DEBUG NGL_GET_BUILDPARTS: BUILD_ALL=${BUILD_ALL}, BUILD_SV=${BUILD_SV}, BUILD_WS=${BUILD_WS}, BUILD_AAR=${BUILD_AAR}")
|
||||
MESSAGE(STATUS "DEBUG NGL_GET_BUILDPARTS: _args (name)=${_args}, _args (value)=${${_args}}, BUILD_ALL=${BUILD_ALL}, BUILD_SV=${BUILD_SV}, BUILD_WS=${BUILD_WS}, BUILD_AAR=${BUILD_AAR}")
|
||||
|
||||
LIST(FIND ${_args} "ALL" _all)
|
||||
IF (_all GREATER -1)
|
||||
@@ -148,8 +147,12 @@ MACRO (NGL_GET_BUILDPARTS _args _buildopts)
|
||||
IF(_idx GREATER -1)
|
||||
LIST(REMOVE_AT ${_args} ${_idx})
|
||||
SET(_at_least_one_keyword_found ON)
|
||||
MESSAGE(STATUS "DEBUG ELSE: _component=${_component}, BUILD_${_component}=${BUILD_${_component}}")
|
||||
IF(BUILD_${_component})
|
||||
LIST(APPEND ${_buildopts} ${_component})
|
||||
MESSAGE(STATUS "DEBUG ELSE: Added ${_component} to _buildopts")
|
||||
ELSE()
|
||||
MESSAGE(STATUS "DEBUG ELSE: BUILD_${_component} is FALSE/NOTFOUND, NOT adding ${_component}")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
@@ -162,10 +165,10 @@ ENDMACRO()
|
||||
|
||||
MACRO (NGL_PARSE_BUILDCOMPONENT_INTERNAL _args _properties _build_target)
|
||||
|
||||
NGL_GET_BUILDPARTS(${_args} _buildopts)
|
||||
NGL_GET_BUILDPARTS(_args _buildopts)
|
||||
SET(${_build_target} OFF)
|
||||
|
||||
MESSAGE(STATUS "DEBUG NGL_PARSE: _buildopts=${_buildopts}, _components=${_components}")
|
||||
MESSAGE(STATUS "DEBUG NGL_PARSE: _args=${_args}, _buildopts=${_buildopts}, _components=${_components}")
|
||||
|
||||
FOREACH(_component ${_components})
|
||||
LIST(FIND _buildopts ${_component} _idx)
|
||||
@@ -320,10 +323,14 @@ MACRO (NGL_ADD_EXECUTABLE)
|
||||
NGL_PARSE_BUILDCOMPONENT_INTERNAL(_args _properties _build_target)
|
||||
LIST(GET _args 0 _target_NAME)
|
||||
|
||||
MESSAGE(STATUS "DEBUG NGL_ADD_EXECUTABLE: _target_NAME=${_target_NAME}, _build_target=${_build_target}")
|
||||
IF(_build_target)
|
||||
MESSAGE(STATUS "DEBUG NGL_ADD_EXECUTABLE: Creating executable ${_target_NAME}")
|
||||
ADD_EXECUTABLE(${_args})
|
||||
SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES ${_properties})
|
||||
SET_PROPERTY(GLOBAL APPEND PROPERTY NGL_TS_TARGETS ${_target_NAME})
|
||||
ELSE()
|
||||
MESSAGE(STATUS "DEBUG NGL_ADD_EXECUTABLE: SKIPPING executable ${_target_NAME}")
|
||||
ENDIF()
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user